Skip to content

Commit 944d96f

Browse files
author
GitLab Bot
committed
Add latest changes from gitlab-org/gitlab@master
1 parent 7a8b152 commit 944d96f

File tree

124 files changed

+1111
-448
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+1111
-448
lines changed

.rubocop_todo/sidekiq_load_balancing/worker_data_consistency.yml

-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
---
22
SidekiqLoadBalancing/WorkerDataConsistency:
33
Exclude:
4-
- 'app/workers/authorized_project_update/periodic_recalculate_worker.rb'
5-
- 'app/workers/authorized_project_update/project_recalculate_worker.rb'
6-
- 'app/workers/authorized_project_update/user_refresh_from_replica_worker.rb'
7-
- 'app/workers/authorized_projects_worker.rb'
84
- 'app/workers/bulk_imports/stale_import_worker.rb'
95
- 'app/workers/bulk_imports/finish_batched_pipeline_worker.rb'
106
- 'app/workers/bulk_imports/pipeline_batch_worker.rb'

.rubocop_todo/style/if_unless_modifier.yml

-10
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,6 @@ Style/IfUnlessModifier:
2424
- 'app/mailers/emails/members.rb'
2525
- 'app/mailers/emails/merge_requests.rb'
2626
- 'app/models/ability.rb'
27-
- 'app/models/appearance.rb'
28-
- 'app/models/application_setting_implementation.rb'
29-
- 'app/models/bulk_imports/entity.rb'
30-
- 'app/models/ci/application_record.rb'
31-
- 'app/models/ci/build.rb'
32-
- 'app/models/ci/build_trace_chunk.rb'
33-
- 'app/models/ci/job_artifact.rb'
34-
- 'app/models/ci/pending_build.rb'
35-
- 'app/models/ci/pipeline.rb'
36-
- 'app/models/ci/runner.rb'
3727
- 'app/models/concerns/ci/artifactable.rb'
3828
- 'app/models/concerns/deprecated_assignee.rb'
3929
- 'app/models/concerns/group_descendant.rb'

Gemfile.checksum

+4-4
Original file line numberDiff line numberDiff line change
@@ -461,15 +461,15 @@
461461
{"name":"openssl-signature_algorithm","version":"1.3.0","platform":"ruby","checksum":"a3b40b5e8276162d4a6e50c7c97cdaf1446f9b2c3946a6fa2c14628e0c957e80"},
462462
{"name":"opentelemetry-api","version":"1.2.5","platform":"ruby","checksum":"ab3d9a0566cd2ee068ade40e840bc973383ab8568e693c0c5712f0c789122cc9"},
463463
{"name":"opentelemetry-common","version":"0.21.0","platform":"ruby","checksum":"fe891a44583a20bc3217b324aec76d066504494951682d391cfd57d40cd01c98"},
464-
{"name":"opentelemetry-exporter-otlp","version":"0.28.1","platform":"ruby","checksum":"5b64f0cdf87643e7581b2983d5cd79df688378f95a19cca42be9cd559c8a5169"},
464+
{"name":"opentelemetry-exporter-otlp","version":"0.29.0","platform":"ruby","checksum":"4d1ca0e01cab8127dcc43eb3b51845dfce2b972d51033df7ce33adbdc30681fa"},
465465
{"name":"opentelemetry-helpers-sql-obfuscation","version":"0.1.0","platform":"ruby","checksum":"bc6ef1373dbcf979647091b3bfc99d7b6fb9669f74c3ae184f58b48adfc8d432"},
466466
{"name":"opentelemetry-instrumentation-action_mailer","version":"0.1.0","platform":"ruby","checksum":"52fe3400bb9051d079a2aed0858fc2d98c677bfb66d163e3b438b67c795dd1a9"},
467467
{"name":"opentelemetry-instrumentation-action_pack","version":"0.9.0","platform":"ruby","checksum":"c5df8472afc9cdbfc1425d9af7816b9cfc1a1a69b86621f1fc624974bd9acb9a"},
468-
{"name":"opentelemetry-instrumentation-action_view","version":"0.7.2","platform":"ruby","checksum":"30f2da1547afd78e2193f16e1cf6d53d9a06650a1ac29b4bda2f1b2d41a3119f"},
468+
{"name":"opentelemetry-instrumentation-action_view","version":"0.7.3","platform":"ruby","checksum":"6da829154e751bd88f5369b97a6346e12c3583a784f58178ccaa0b46d301ea21"},
469469
{"name":"opentelemetry-instrumentation-active_job","version":"0.7.7","platform":"ruby","checksum":"5db8820afd43e44d383705c0919249f11082f4472c96c341fc17b8954677aaa8"},
470470
{"name":"opentelemetry-instrumentation-active_record","version":"0.7.4","platform":"ruby","checksum":"7dd72e74c846130641fc001eb9bd90775a2153501349a7a429f2ed5eb38900bb"},
471471
{"name":"opentelemetry-instrumentation-active_support","version":"0.6.0","platform":"ruby","checksum":"4fe71e2be21135c4a6eb8086998c508deec50080900829fb695ee01b93b507e0"},
472-
{"name":"opentelemetry-instrumentation-aws_sdk","version":"0.5.4","platform":"ruby","checksum":"1805dac273baf70252568423f2005c98afbff4f385aeea9eb423fd48952cb3bb"},
472+
{"name":"opentelemetry-instrumentation-aws_sdk","version":"0.6.0","platform":"ruby","checksum":"29c077268a940ebe431987b7f0ba61327ad98d278677912d7c191fde25799efd"},
473473
{"name":"opentelemetry-instrumentation-base","version":"0.22.3","platform":"ruby","checksum":"f61c434f0406cdc878bc188f67e644f94dba4be553d2fd21b2d1faa82731605f"},
474474
{"name":"opentelemetry-instrumentation-concurrent_ruby","version":"0.21.4","platform":"ruby","checksum":"04efc8114459bbd5d104b559c413aef42e12a1a489e41df2b7b89eb1f88714ce"},
475475
{"name":"opentelemetry-instrumentation-ethon","version":"0.21.8","platform":"ruby","checksum":"19aa7d60c0339d5d1533da0a3a401a8e8b322f1e6399d016168970923551dee8"},
@@ -480,7 +480,7 @@
480480
{"name":"opentelemetry-instrumentation-http","version":"0.23.4","platform":"ruby","checksum":"190b401b4a2758fc1ce20fa073f104e68c3152661e05769f5aa95c5dd1a3b916"},
481481
{"name":"opentelemetry-instrumentation-http_client","version":"0.22.7","platform":"ruby","checksum":"3fdca85a200a0e8b72f02cfb7f609062fc793353a6c2ffee2da8e005f62fce3c"},
482482
{"name":"opentelemetry-instrumentation-net_http","version":"0.22.7","platform":"ruby","checksum":"c07427ff6b7bed124bf004008be4d3a4aef8865629f7a2c4614c4a8d357246d0"},
483-
{"name":"opentelemetry-instrumentation-pg","version":"0.28.0","platform":"ruby","checksum":"241de140544ddc70919fffd9ab587a266c7670659283e276dcfecfabea5c61eb"},
483+
{"name":"opentelemetry-instrumentation-pg","version":"0.29.0","platform":"ruby","checksum":"6fcbdddfb757fed97b3bce0fb9f5f206d4cdb5c24e3da78c0dc54100c195f3d1"},
484484
{"name":"opentelemetry-instrumentation-rack","version":"0.24.6","platform":"ruby","checksum":"c0f27bdc8d407bb4d97ead27b6ee72243b86f32f7a6a703f5158fc2e18ebaeb6"},
485485
{"name":"opentelemetry-instrumentation-rails","version":"0.31.2","platform":"ruby","checksum":"891f20e3123b0ea97f7ede60c2a5415191c5b45f6378ebf03a45289e66d0648a"},
486486
{"name":"opentelemetry-instrumentation-rake","version":"0.2.2","platform":"ruby","checksum":"fbde8a6aab77c09bf0f94d914dd26dcf2e23ec67e2300f06a1cb8294a97d8020"},

Gemfile.lock

+5-5
Original file line numberDiff line numberDiff line change
@@ -1275,7 +1275,7 @@ GEM
12751275
opentelemetry-api (1.2.5)
12761276
opentelemetry-common (0.21.0)
12771277
opentelemetry-api (~> 1.0)
1278-
opentelemetry-exporter-otlp (0.28.1)
1278+
opentelemetry-exporter-otlp (0.29.0)
12791279
google-protobuf (>= 3.18)
12801280
googleapis-common-protos-types (~> 1.3)
12811281
opentelemetry-api (~> 1.1)
@@ -1292,9 +1292,9 @@ GEM
12921292
opentelemetry-api (~> 1.0)
12931293
opentelemetry-instrumentation-base (~> 0.22.1)
12941294
opentelemetry-instrumentation-rack (~> 0.21)
1295-
opentelemetry-instrumentation-action_view (0.7.2)
1295+
opentelemetry-instrumentation-action_view (0.7.3)
12961296
opentelemetry-api (~> 1.0)
1297-
opentelemetry-instrumentation-active_support (~> 0.1)
1297+
opentelemetry-instrumentation-active_support (~> 0.6)
12981298
opentelemetry-instrumentation-base (~> 0.22.1)
12991299
opentelemetry-instrumentation-active_job (0.7.7)
13001300
opentelemetry-api (~> 1.0)
@@ -1305,7 +1305,7 @@ GEM
13051305
opentelemetry-instrumentation-active_support (0.6.0)
13061306
opentelemetry-api (~> 1.0)
13071307
opentelemetry-instrumentation-base (~> 0.22.1)
1308-
opentelemetry-instrumentation-aws_sdk (0.5.4)
1308+
opentelemetry-instrumentation-aws_sdk (0.6.0)
13091309
opentelemetry-api (~> 1.0)
13101310
opentelemetry-instrumentation-base (~> 0.22.1)
13111311
opentelemetry-instrumentation-base (0.22.3)
@@ -1339,7 +1339,7 @@ GEM
13391339
opentelemetry-instrumentation-net_http (0.22.7)
13401340
opentelemetry-api (~> 1.0)
13411341
opentelemetry-instrumentation-base (~> 0.22.1)
1342-
opentelemetry-instrumentation-pg (0.28.0)
1342+
opentelemetry-instrumentation-pg (0.29.0)
13431343
opentelemetry-api (~> 1.0)
13441344
opentelemetry-helpers-sql-obfuscation
13451345
opentelemetry-instrumentation-base (~> 0.22.1)

Gemfile.next.checksum

+4-4
Original file line numberDiff line numberDiff line change
@@ -466,15 +466,15 @@
466466
{"name":"openssl-signature_algorithm","version":"1.3.0","platform":"ruby","checksum":"a3b40b5e8276162d4a6e50c7c97cdaf1446f9b2c3946a6fa2c14628e0c957e80"},
467467
{"name":"opentelemetry-api","version":"1.2.5","platform":"ruby","checksum":"ab3d9a0566cd2ee068ade40e840bc973383ab8568e693c0c5712f0c789122cc9"},
468468
{"name":"opentelemetry-common","version":"0.21.0","platform":"ruby","checksum":"fe891a44583a20bc3217b324aec76d066504494951682d391cfd57d40cd01c98"},
469-
{"name":"opentelemetry-exporter-otlp","version":"0.28.1","platform":"ruby","checksum":"5b64f0cdf87643e7581b2983d5cd79df688378f95a19cca42be9cd559c8a5169"},
469+
{"name":"opentelemetry-exporter-otlp","version":"0.29.0","platform":"ruby","checksum":"4d1ca0e01cab8127dcc43eb3b51845dfce2b972d51033df7ce33adbdc30681fa"},
470470
{"name":"opentelemetry-helpers-sql-obfuscation","version":"0.1.0","platform":"ruby","checksum":"bc6ef1373dbcf979647091b3bfc99d7b6fb9669f74c3ae184f58b48adfc8d432"},
471471
{"name":"opentelemetry-instrumentation-action_mailer","version":"0.1.0","platform":"ruby","checksum":"52fe3400bb9051d079a2aed0858fc2d98c677bfb66d163e3b438b67c795dd1a9"},
472472
{"name":"opentelemetry-instrumentation-action_pack","version":"0.9.0","platform":"ruby","checksum":"c5df8472afc9cdbfc1425d9af7816b9cfc1a1a69b86621f1fc624974bd9acb9a"},
473-
{"name":"opentelemetry-instrumentation-action_view","version":"0.7.2","platform":"ruby","checksum":"30f2da1547afd78e2193f16e1cf6d53d9a06650a1ac29b4bda2f1b2d41a3119f"},
473+
{"name":"opentelemetry-instrumentation-action_view","version":"0.7.3","platform":"ruby","checksum":"6da829154e751bd88f5369b97a6346e12c3583a784f58178ccaa0b46d301ea21"},
474474
{"name":"opentelemetry-instrumentation-active_job","version":"0.7.7","platform":"ruby","checksum":"5db8820afd43e44d383705c0919249f11082f4472c96c341fc17b8954677aaa8"},
475475
{"name":"opentelemetry-instrumentation-active_record","version":"0.7.4","platform":"ruby","checksum":"7dd72e74c846130641fc001eb9bd90775a2153501349a7a429f2ed5eb38900bb"},
476476
{"name":"opentelemetry-instrumentation-active_support","version":"0.6.0","platform":"ruby","checksum":"4fe71e2be21135c4a6eb8086998c508deec50080900829fb695ee01b93b507e0"},
477-
{"name":"opentelemetry-instrumentation-aws_sdk","version":"0.5.4","platform":"ruby","checksum":"1805dac273baf70252568423f2005c98afbff4f385aeea9eb423fd48952cb3bb"},
477+
{"name":"opentelemetry-instrumentation-aws_sdk","version":"0.6.0","platform":"ruby","checksum":"29c077268a940ebe431987b7f0ba61327ad98d278677912d7c191fde25799efd"},
478478
{"name":"opentelemetry-instrumentation-base","version":"0.22.3","platform":"ruby","checksum":"f61c434f0406cdc878bc188f67e644f94dba4be553d2fd21b2d1faa82731605f"},
479479
{"name":"opentelemetry-instrumentation-concurrent_ruby","version":"0.21.4","platform":"ruby","checksum":"04efc8114459bbd5d104b559c413aef42e12a1a489e41df2b7b89eb1f88714ce"},
480480
{"name":"opentelemetry-instrumentation-ethon","version":"0.21.8","platform":"ruby","checksum":"19aa7d60c0339d5d1533da0a3a401a8e8b322f1e6399d016168970923551dee8"},
@@ -485,7 +485,7 @@
485485
{"name":"opentelemetry-instrumentation-http","version":"0.23.4","platform":"ruby","checksum":"190b401b4a2758fc1ce20fa073f104e68c3152661e05769f5aa95c5dd1a3b916"},
486486
{"name":"opentelemetry-instrumentation-http_client","version":"0.22.7","platform":"ruby","checksum":"3fdca85a200a0e8b72f02cfb7f609062fc793353a6c2ffee2da8e005f62fce3c"},
487487
{"name":"opentelemetry-instrumentation-net_http","version":"0.22.7","platform":"ruby","checksum":"c07427ff6b7bed124bf004008be4d3a4aef8865629f7a2c4614c4a8d357246d0"},
488-
{"name":"opentelemetry-instrumentation-pg","version":"0.28.0","platform":"ruby","checksum":"241de140544ddc70919fffd9ab587a266c7670659283e276dcfecfabea5c61eb"},
488+
{"name":"opentelemetry-instrumentation-pg","version":"0.29.0","platform":"ruby","checksum":"6fcbdddfb757fed97b3bce0fb9f5f206d4cdb5c24e3da78c0dc54100c195f3d1"},
489489
{"name":"opentelemetry-instrumentation-rack","version":"0.24.6","platform":"ruby","checksum":"c0f27bdc8d407bb4d97ead27b6ee72243b86f32f7a6a703f5158fc2e18ebaeb6"},
490490
{"name":"opentelemetry-instrumentation-rails","version":"0.31.2","platform":"ruby","checksum":"891f20e3123b0ea97f7ede60c2a5415191c5b45f6378ebf03a45289e66d0648a"},
491491
{"name":"opentelemetry-instrumentation-rake","version":"0.2.2","platform":"ruby","checksum":"fbde8a6aab77c09bf0f94d914dd26dcf2e23ec67e2300f06a1cb8294a97d8020"},

Gemfile.next.lock

+5-5
Original file line numberDiff line numberDiff line change
@@ -1290,7 +1290,7 @@ GEM
12901290
opentelemetry-api (1.2.5)
12911291
opentelemetry-common (0.21.0)
12921292
opentelemetry-api (~> 1.0)
1293-
opentelemetry-exporter-otlp (0.28.1)
1293+
opentelemetry-exporter-otlp (0.29.0)
12941294
google-protobuf (>= 3.18)
12951295
googleapis-common-protos-types (~> 1.3)
12961296
opentelemetry-api (~> 1.1)
@@ -1307,9 +1307,9 @@ GEM
13071307
opentelemetry-api (~> 1.0)
13081308
opentelemetry-instrumentation-base (~> 0.22.1)
13091309
opentelemetry-instrumentation-rack (~> 0.21)
1310-
opentelemetry-instrumentation-action_view (0.7.2)
1310+
opentelemetry-instrumentation-action_view (0.7.3)
13111311
opentelemetry-api (~> 1.0)
1312-
opentelemetry-instrumentation-active_support (~> 0.1)
1312+
opentelemetry-instrumentation-active_support (~> 0.6)
13131313
opentelemetry-instrumentation-base (~> 0.22.1)
13141314
opentelemetry-instrumentation-active_job (0.7.7)
13151315
opentelemetry-api (~> 1.0)
@@ -1320,7 +1320,7 @@ GEM
13201320
opentelemetry-instrumentation-active_support (0.6.0)
13211321
opentelemetry-api (~> 1.0)
13221322
opentelemetry-instrumentation-base (~> 0.22.1)
1323-
opentelemetry-instrumentation-aws_sdk (0.5.4)
1323+
opentelemetry-instrumentation-aws_sdk (0.6.0)
13241324
opentelemetry-api (~> 1.0)
13251325
opentelemetry-instrumentation-base (~> 0.22.1)
13261326
opentelemetry-instrumentation-base (0.22.3)
@@ -1354,7 +1354,7 @@ GEM
13541354
opentelemetry-instrumentation-net_http (0.22.7)
13551355
opentelemetry-api (~> 1.0)
13561356
opentelemetry-instrumentation-base (~> 0.22.1)
1357-
opentelemetry-instrumentation-pg (0.28.0)
1357+
opentelemetry-instrumentation-pg (0.29.0)
13581358
opentelemetry-api (~> 1.0)
13591359
opentelemetry-helpers-sql-obfuscation
13601360
opentelemetry-instrumentation-base (~> 0.22.1)

app/assets/javascripts/behaviors/markdown/copy_as_gfm.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export class CopyAsGFM {
1111
const isIOS = /\b(iPad|iPhone|iPod)(?=;)/.test(userAgent);
1212
if (isIOS) return;
1313

14-
$(document).on('copy', '.md', (e) => {
14+
$(document).on('copy', '.md, .duo-chat-message', (e) => {
1515
CopyAsGFM.copyAsGFM(e, CopyAsGFM.transformGFMSelection);
1616
});
1717
$(document).on('copy', 'pre.code.highlight, table.code td.line_content', (e) => {

app/assets/javascripts/issues/list/components/empty_state_without_any_issues.vue

+31-23
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import emptyStateSvg from '@gitlab/svgs/dist/illustrations/empty-state/empty-iss
33
import { GlButton, GlDisclosureDropdown, GlEmptyState, GlLink, GlSprintf } from '@gitlab/ui';
44
import { helpPagePath } from '~/helpers/help_page_helper';
55
import CsvImportExportButtons from '~/issuable/components/csv_import_export_buttons.vue';
6-
import { s__ } from '~/locale';
6+
import { s__, __ } from '~/locale';
77
import NewResourceDropdown from '~/vue_shared/components/new_resource_dropdown/new_resource_dropdown.vue';
88
import { hasNewIssueDropdown } from '../has_new_issue_dropdown_mixin';
99
@@ -63,6 +63,13 @@ export default {
6363
default: false,
6464
},
6565
},
66+
computed: {
67+
createProjectMessage() {
68+
return this.showNewIssueDropdown
69+
? __('Issues exist in projects. Select a project to create an issue, or create a project.')
70+
: __('Issues exist in projects. To create an issue, first create a project.');
71+
},
72+
},
6673
};
6774
</script>
6875

@@ -80,28 +87,30 @@ export default {
8087
data-testid="issuable-empty-state"
8188
>
8289
<template #description>
90+
<p
91+
v-if="canCreateProjects"
92+
data-testid="create-project-message"
93+
class="gl-my-2 gl-text-subtle"
94+
>
95+
{{ createProjectMessage }}
96+
</p>
8397
<gl-link
8498
:href="$options.issuesHelpPagePath"
8599
:data-track-action="isProject && 'click_learn_more_project_issues_empty_list_page'"
86100
:data-track-label="isProject && 'learn_more_project_issues_empty_list'"
87101
>
88102
{{ __('Learn more about issues.') }}
89103
</gl-link>
90-
<p v-if="canCreateProjects">
91-
<strong>{{
92-
__('Issues exist in projects, so to create an issue, first create a project.')
93-
}}</strong>
94-
</p>
95104
</template>
96105
<template #actions>
97-
<gl-button
98-
v-if="canCreateProjects"
99-
:href="newProjectPath"
100-
variant="confirm"
101-
class="gl-mx-2 gl-mb-3"
102-
>
103-
{{ __('New project') }}
104-
</gl-button>
106+
<new-resource-dropdown
107+
v-if="showNewIssueDropdown"
108+
class="gl-mx-2 gl-mb-3 gl-self-center"
109+
:query="$options.searchProjectsQuery"
110+
:query-variables="newIssueDropdownQueryVariables"
111+
:extract-projects="extractProjects"
112+
:group-id="groupId"
113+
/>
105114
<gl-button
106115
v-if="showNewIssueLink"
107116
:href="newIssuePath"
@@ -112,6 +121,14 @@ export default {
112121
>
113122
{{ __('New issue') }}
114123
</gl-button>
124+
<gl-button
125+
v-if="canCreateProjects"
126+
:href="newProjectPath"
127+
:variant="showNewIssueDropdown ? 'default' : 'confirm'"
128+
class="gl-mx-2 gl-mb-3"
129+
>
130+
{{ __('New project') }}
131+
</gl-button>
115132

116133
<gl-disclosure-dropdown
117134
v-if="showCsvButtons"
@@ -125,15 +142,6 @@ export default {
125142
track-import-click
126143
/>
127144
</gl-disclosure-dropdown>
128-
129-
<new-resource-dropdown
130-
v-if="showNewIssueDropdown"
131-
class="gl-mx-2 gl-mb-3 gl-self-center"
132-
:query="$options.searchProjectsQuery"
133-
:query-variables="newIssueDropdownQueryVariables"
134-
:extract-projects="extractProjects"
135-
:group-id="groupId"
136-
/>
137145
</template>
138146
</gl-empty-state>
139147
<hr />

app/assets/javascripts/merge_request_dashboard/components/merge_request.vue

+3-3
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,15 @@ export default {
7676
>
7777
{{ mergeRequest.title }}
7878
</gl-link>
79-
<div class="gl-mb-2 gl-mt-2 gl-text-sm gl-text-secondary">
79+
<div class="gl-mb-2 gl-mt-2 gl-text-sm gl-text-subtle">
8080
<gl-sprintf
8181
:message="__('%{reference} %{divider} created %{createdAt} by %{author} %{milestone}')"
8282
>
8383
<template #reference>{{ mergeRequest.reference }}</template>
8484
<template #divider>&middot;</template>
8585
<template #createdAt><time-ago-tooltip :time="mergeRequest.createdAt" /></template>
8686
<template #author>
87-
<gl-link :href="mergeRequest.author.webUrl" class="gl-text-secondary">
87+
<gl-link :href="mergeRequest.author.webUrl" class="gl-text-subtle">
8888
{{ mergeRequest.author.name }}
8989
</gl-link>
9090
</template>
@@ -127,7 +127,7 @@ export default {
127127
<span>{{ mergeRequest.diffStatsSummary.deletions }}</span>
128128
</div>
129129
</div>
130-
<div class="gl-mt-1 gl-text-right gl-text-sm gl-text-secondary">
130+
<div class="gl-mt-1 gl-text-right gl-text-sm gl-text-subtle">
131131
<gl-sprintf :message="__('Updated %{updatedAt}')">
132132
<template #updatedAt>
133133
<time-ago-tooltip :time="mergeRequest.updatedAt" />

app/assets/javascripts/packages_and_registries/settings/project/constants.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
import { s__, __ } from '~/locale';
22

3-
export const CONTAINER_CLEANUP_POLICY_TITLE = s__('ContainerRegistry|Cleanup policies');
3+
export const CONTAINER_CLEANUP_POLICY_TITLE = s__(
4+
'ContainerRegistry|Container registry cleanup policies',
5+
);
46
export const CONTAINER_CLEANUP_POLICY_DESCRIPTION = s__(
57
`ContainerRegistry|Save storage space by automatically deleting tags from the container registry and keeping the ones you want. %{linkStart}How does cleanup work?%{linkEnd}`,
68
);
79
export const CONTAINER_CLEANUP_POLICY_RULES_DESCRIPTION = s__(
8-
'ContainerRegistry|Set rules to automatically remove unused packages to save storage space.',
10+
'ContainerRegistry|Set rules to automatically remove unused image tags to save storage space.',
911
);
1012
export const CONTAINER_CLEANUP_POLICY_EDIT_RULES = s__('ContainerRegistry|Edit cleanup rules');
1113
export const CONTAINER_CLEANUP_POLICY_SET_RULES = s__('ContainerRegistry|Set cleanup rules');

0 commit comments

Comments
 (0)