diff --git a/app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue b/app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue index b5239b437d683ad70ce18e8a4a41fd2a28ce9296..206e053192c2733809306abd4b13eddbbda962f4 100644 --- a/app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue +++ b/app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue @@ -337,7 +337,7 @@ export default { -import { GlBadge, GlIcon, GlAvatar, GlButton, GlLink } from '@gitlab/ui'; +import { GlBadge, GlAvatar, GlButton, GlLink } from '@gitlab/ui'; import { REPORT_HEADER_I18N, STATUS_OPEN, STATUS_CLOSED } from '../constants'; import ReportActions from './report_actions.vue'; @@ -7,7 +7,6 @@ export default { name: 'ReportHeader', components: { GlBadge, - GlIcon, GlAvatar, GlButton, GlLink, @@ -56,9 +55,8 @@ export default { class="gl-py-4 gl-border-b gl-display-flex gl-justify-content-space-between gl-flex-direction-column gl-sm-flex-direction-row" >
- - - {{ badgeText }} + + {{ badgeText }}

diff --git a/app/assets/javascripts/analytics/cycle_analytics/components/stage_table.vue b/app/assets/javascripts/analytics/cycle_analytics/components/stage_table.vue index 5c5d56625562f4cdeee824c99a5c6cca7b932d1d..498fbf792f9bd7e40e52b8f0e812cf310070aa1a 100644 --- a/app/assets/javascripts/analytics/cycle_analytics/components/stage_table.vue +++ b/app/assets/javascripts/analytics/cycle_analytics/components/stage_table.vue @@ -211,9 +211,7 @@ export default { > diff --git a/app/assets/javascripts/ci/jobs_page/components/job_cells/job_cell.vue b/app/assets/javascripts/ci/jobs_page/components/job_cells/job_cell.vue index 01d409f68f6969d347c84b27d80f03e521527517..b72a9778e906634ca5b35673adc8451f6acd5775 100644 --- a/app/assets/javascripts/ci/jobs_page/components/job_cells/job_cell.vue +++ b/app/assets/javascripts/ci/jobs_page/components/job_cells/job_cell.vue @@ -6,7 +6,6 @@ import { SUCCESS_STATUS } from '../../../constants'; export default { iconSize: 12, - badgeSize: 'sm', i18n: { stuckText: s__('Jobs|Job is stuck. Check runners.'), }, @@ -123,42 +122,19 @@ export default {

- + {{ tag }} - {{ s__('Job|trigger token') }} - {{ s__('Job|allowed to fail') }} - {{ s__('Job|delayed') }} - + {{ s__('Job|manual') }}
diff --git a/app/assets/javascripts/ci/jobs_page/components/jobs_table_tabs.vue b/app/assets/javascripts/ci/jobs_page/components/jobs_table_tabs.vue index b753195da9ab9395b0d3b6b4ccf2c7ddd90e093c..7dbf6e7823a3d9e203f7e0bc0429c19dd476d34e 100644 --- a/app/assets/javascripts/ci/jobs_page/components/jobs_table_tabs.vue +++ b/app/assets/javascripts/ci/jobs_page/components/jobs_table_tabs.vue @@ -76,7 +76,7 @@ export default { {{ tab.text }} - + {{ tab.count }} diff --git a/app/assets/javascripts/ci/pipeline_details/graph/components/job_item.vue b/app/assets/javascripts/ci/pipeline_details/graph/components/job_item.vue index 801da4d5f56574db620062f8284c72d26937000d..885f2a055389496d815d2cc637af841e8f9ee084 100644 --- a/app/assets/javascripts/ci/pipeline_details/graph/components/job_item.vue +++ b/app/assets/javascripts/ci/pipeline_details/graph/components/job_item.vue @@ -366,7 +366,6 @@ export default { v-if="isBridge" class="gl-mt-3 gl-ml-7" variant="info" - size="sm" data-testid="job-bridge-badge" > {{ $options.i18n.bridgeBadgeText }} diff --git a/app/assets/javascripts/ci/pipeline_details/graph/components/linked_pipeline.vue b/app/assets/javascripts/ci/pipeline_details/graph/components/linked_pipeline.vue index 1d23dbeb78566a148c4390c038fe452054512037..053c13e488821d8d77db2cef60e1a2b4734962ef 100644 --- a/app/assets/javascripts/ci/pipeline_details/graph/components/linked_pipeline.vue +++ b/app/assets/javascripts/ci/pipeline_details/graph/components/linked_pipeline.vue @@ -279,7 +279,7 @@ export default {
- + {{ label }}
diff --git a/app/assets/javascripts/ci/pipeline_details/header/components/header_badges.vue b/app/assets/javascripts/ci/pipeline_details/header/components/header_badges.vue index 0e08347ac6ad43dfc398ac7b057c8d9cf4a81faa..6ce8c874a790809a32294de4be86eb4fab270b09 100644 --- a/app/assets/javascripts/ci/pipeline_details/header/components/header_badges.vue +++ b/app/assets/javascripts/ci/pipeline_details/header/components/header_badges.vue @@ -78,7 +78,6 @@ export default { v-gl-tooltip :title="__('This pipeline was created by a schedule')" variant="info" - size="sm" > {{ s__('Pipelines|Scheduled') }}
@@ -87,7 +86,6 @@ export default { v-gl-tooltip :title="__('This pipeline was created by an API call authenticated with a trigger token')" variant="info" - size="sm" > {{ __('trigger token') }} @@ -96,7 +94,6 @@ export default { v-gl-tooltip :title="__('This is a child pipeline within the parent pipeline')" variant="info" - size="sm" > - {{ __('stuck') }} + {{ + __('stuck') + }} {{ s__('Pipeline|merge request') }} @@ -193,7 +182,6 @@ export default { ) " variant="info" - size="sm" data-testid="pipeline-url-merged-results" >{{ s__('Pipeline|merged results') }} @@ -202,7 +190,6 @@ export default { v-gl-tooltip :title="__('Pipeline ran in fork of project')" variant="info" - size="sm" data-testid="pipeline-url-fork" >{{ __('fork') }} @@ -211,7 +198,6 @@ export default { v-gl-tooltip :title="__('This pipeline was triggered using the api')" variant="info" - size="sm" data-testid="pipeline-api-badge" >{{ s__('Pipeline|api') }} diff --git a/app/assets/javascripts/ci/runner/components/cells/runner_summary_cell.vue b/app/assets/javascripts/ci/runner/components/cells/runner_summary_cell.vue index 6d39b3872e72460a2cd3856e87c55b6d9492e5df..930876e62cbbba47403971bb9f26f0a9bcd1db19 100644 --- a/app/assets/javascripts/ci/runner/components/cells/runner_summary_cell.vue +++ b/app/assets/javascripts/ci/runner/components/cells/runner_summary_cell.vue @@ -84,14 +84,14 @@ export default { - + - +
- + diff --git a/app/assets/javascripts/ci/runner/components/runner_details_tabs.vue b/app/assets/javascripts/ci/runner/components/runner_details_tabs.vue index e4190a4dffd99533ac5d5523ddd2f8635d4d1439..e054d7a0cf11c1d0374f48fc839292d066513dc8 100644 --- a/app/assets/javascripts/ci/runner/components/runner_details_tabs.vue +++ b/app/assets/javascripts/ci/runner/components/runner_details_tabs.vue @@ -76,12 +76,7 @@ export default { diff --git a/app/assets/javascripts/code_navigation/components/popover.vue b/app/assets/javascripts/code_navigation/components/popover.vue index b558dbeb4863192d9c8f18185c4da94e7330beea..79b8f62fdabd879e6ed5269f569c6ba54de48007 100644 --- a/app/assets/javascripts/code_navigation/components/popover.vue +++ b/app/assets/javascripts/code_navigation/components/popover.vue @@ -128,7 +128,7 @@ export default { - + {{ group.permission }} diff --git a/app/assets/javascripts/ide/components/activity_bar.vue b/app/assets/javascripts/ide/components/activity_bar.vue index 73620b573b41b0d7d09f28381ba79fb8f523b711..903bba7b606fc715cb06db2862de026b313b4919 100644 --- a/app/assets/javascripts/ide/components/activity_bar.vue +++ b/app/assets/javascripts/ide/components/activity_bar.vue @@ -88,7 +88,6 @@ export default { {{ stagedFiles.length }} diff --git a/app/assets/javascripts/ide/components/pipelines/list.vue b/app/assets/javascripts/ide/components/pipelines/list.vue index 5f0030b07951f5e044f5c2a1968ef1ef433918bf..419ae38549519b97ff4ca234218ab201d9ef234a 100644 --- a/app/assets/javascripts/ide/components/pipelines/list.vue +++ b/app/assets/javascripts/ide/components/pipelines/list.vue @@ -91,16 +91,14 @@ export default { diff --git a/app/assets/javascripts/import_entities/components/import_status.vue b/app/assets/javascripts/import_entities/components/import_status.vue index b4c361182f344b569ae5cadf736cf4d829b53676..a2e29f5f7fe7799f0cb95030190e7ac2d7115f68 100644 --- a/app/assets/javascripts/import_entities/components/import_status.vue +++ b/app/assets/javascripts/import_entities/components/import_status.vue @@ -104,7 +104,7 @@ export default {