Skip to content

Commit de122df

Browse files
author
GitLab Bot
committed
Add latest changes from gitlab-org/gitlab@master
1 parent 326c35a commit de122df

File tree

88 files changed

+288
-312
lines changed

Some content is hidden

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

88 files changed

+288
-312
lines changed

‎Gemfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,9 @@ gem 'seed-fu', '~> 2.3.7', feature_category: :shared
238238
gem 'elasticsearch-model', '~> 7.2', feature_category: :global_search
239239
gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation', feature_category: :global_search
240240
gem 'elasticsearch-api', '7.17.11', feature_category: :global_search
241-
gem 'aws-sdk-core', '~> 3.215.0', feature_category: :global_search
241+
gem 'aws-sdk-core', '~> 3.222.0', feature_category: :global_search
242242
gem 'aws-sdk-cloudformation', '~> 1', feature_category: :global_search
243-
gem 'aws-sdk-s3', '~> 1.177.0', feature_category: :global_search
243+
gem 'aws-sdk-s3', '~> 1.183.0', feature_category: :global_search
244244
gem 'faraday-typhoeus', '~> 1.1', feature_category: :global_search
245245
gem 'faraday_middleware-aws-sigv4', '~> 1.0.1', feature_category: :global_search
246246
# Used with Elasticsearch to support http keep-alive connections
@@ -505,7 +505,7 @@ end
505505
group :development, :test do
506506
gem 'deprecation_toolkit', '~> 1.5.1', require: false, feature_category: :shared
507507
gem 'bullet', '~> 7.2.0', feature_category: :shared
508-
gem 'parser', '= 3.3.7.1', feature_category: :shared
508+
gem 'parser', '= 3.3.7.4', feature_category: :shared
509509
gem 'pry-byebug', feature_category: :shared
510510
gem 'pry-rails', '~> 0.3.9', feature_category: :shared
511511
gem 'pry-shell', '~> 0.6.4', feature_category: :shared
@@ -728,7 +728,7 @@ gem 'cvss-suite', '~> 3.3.0', require: 'cvss_suite', feature_category: :software
728728
gem 'arr-pm', '~> 0.0.12', feature_category: :package_registry
729729

730730
# Remote Development
731-
gem 'devfile', '~> 0.4.0', feature_category: :workspaces
731+
gem 'devfile', '~> 0.4.3', feature_category: :workspaces
732732

733733
# Apple plist parsing
734734
gem 'CFPropertyList', '~> 3.0.0', feature_category: :mobile_devops

‎Gemfile.checksum

+7-7
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
{"name":"aws-eventstream","version":"1.3.0","platform":"ruby","checksum":"f1434cc03ab2248756eb02cfa45e900e59a061d7fbdc4a9fd82a5dd23d796d3f"},
3737
{"name":"aws-partitions","version":"1.1001.0","platform":"ruby","checksum":"2979f3317d3a757508d35d0f322839f422cbc8459589b7cc4a3889d0085a8307"},
3838
{"name":"aws-sdk-cloudformation","version":"1.41.0","platform":"ruby","checksum":"31e47539719734413671edf9b1a31f8673fbf9688549f50c41affabbcb1c6b26"},
39-
{"name":"aws-sdk-core","version":"3.215.0","platform":"ruby","checksum":"214168fb749e1209a87ecf3ed1c93277976f9739883263b7478d052ccc6e4e49"},
39+
{"name":"aws-sdk-core","version":"3.222.2","platform":"ruby","checksum":"0639070595c6d123fc371d773a2a86f9fc208466ec88e9763d7af924a757c8d1"},
4040
{"name":"aws-sdk-kms","version":"1.76.0","platform":"ruby","checksum":"e7f75013cba9ba357144f66bbc600631c192e2cda9dd572794be239654e2cf49"},
41-
{"name":"aws-sdk-s3","version":"1.177.0","platform":"ruby","checksum":"bf2fd9210c3e534f2bd4d90cf855429859bdbfc1911f4d61045a3aaa3ff2f183"},
41+
{"name":"aws-sdk-s3","version":"1.183.0","platform":"ruby","checksum":"8c06b0330c76fc57b4a04a94aec25a8474160b05b2436334d9f8e57ea2799f4c"},
4242
{"name":"aws-sigv4","version":"1.9.1","platform":"ruby","checksum":"7753e320c39f80f82f9e0883b30de0e7b99e756adbaedc80c50b6ad59d49c379"},
4343
{"name":"axe-core-api","version":"4.10.3","platform":"ruby","checksum":"6e10f3ed1c031804f16e8154d9d5dc658564d10850cee860e125fe665c3f0148"},
4444
{"name":"axe-core-rspec","version":"4.10.3","platform":"ruby","checksum":"ca21d0111e2d0fcd0f1da922c9071337336732aa6a3a8dc21bed94c9a701527e"},
@@ -113,10 +113,10 @@
113113
{"name":"deprecation_toolkit","version":"1.5.1","platform":"ruby","checksum":"a8a1ab1a19ae40ea12560b65010e099f3459ebde390b76621ef0c21c516a04ba"},
114114
{"name":"derailed_benchmarks","version":"2.2.1","platform":"ruby","checksum":"654280664fded41c9cd8fc27fc0fcfaf096023afab90eb4ac1185ba70c5d4439"},
115115
{"name":"descendants_tracker","version":"0.0.4","platform":"ruby","checksum":"e9c41dd4cfbb85829a9301ea7e7c48c2a03b26f09319db230e6479ccdc780897"},
116-
{"name":"devfile","version":"0.4.0","platform":"aarch64-linux","checksum":"ca9a030210755023608e8f853794c0006ebd1acff2b0f54a47202a9bf98a8bce"},
117-
{"name":"devfile","version":"0.4.0","platform":"arm64-darwin","checksum":"99588818b3833373236af0cf0559932a4dac4ee6fa017fa7f8885e6acb83a7e3"},
118-
{"name":"devfile","version":"0.4.0","platform":"ruby","checksum":"885b7728dae945582321364346f5bb59c4f92457f6cea2231c30ad1e5a168af9"},
119-
{"name":"devfile","version":"0.4.0","platform":"x86_64-linux","checksum":"942fb20bce2a13a58ec58632ce1c7a1323cc7e95819e39b548529044b4ad89bc"},
116+
{"name":"devfile","version":"0.4.3","platform":"aarch64-linux","checksum":"c603ed2d57eef71b7233b68816c37dffc3ce51a2ac3ce81ea4cb1e00c2fb9cb7"},
117+
{"name":"devfile","version":"0.4.3","platform":"arm64-darwin","checksum":"12f0eec17100b11c3f6afa573b0dd49aa84b4cfd1d25401f6b9aa05fd975123e"},
118+
{"name":"devfile","version":"0.4.3","platform":"ruby","checksum":"5ab6061a9848f6f7f387767326f6f77ef068347656ea63db0917a3f5fbdd74fd"},
119+
{"name":"devfile","version":"0.4.3","platform":"x86_64-linux","checksum":"d3077aaa037dd35b5ff92c5d3b2f167f98a5844fb1db4b76afbe4500ad6fbe03"},
120120
{"name":"device_detector","version":"1.0.0","platform":"ruby","checksum":"b800fb3150b00c23e87b6768011808ac1771fffaae74c3238ebaf2b782947a7d"},
121121
{"name":"devise","version":"4.9.4","platform":"ruby","checksum":"920042fe5e704c548aa4eb65ebdd65980b83ffae67feb32c697206bfd975a7f8"},
122122
{"name":"devise-two-factor","version":"4.1.1","platform":"ruby","checksum":"c95f5b07533e62217aaed3c386874d94e2d472fb5f2b6598afe8600fc17a8b95"},
@@ -509,7 +509,7 @@
509509
{"name":"pact-support","version":"1.20.0","platform":"ruby","checksum":"41c343a3124fb379684b9ad9f1a0766c5fa18d3b78d433a52e5552d8b9475871"},
510510
{"name":"paper_trail","version":"15.1.0","platform":"ruby","checksum":"0dbccd97e9d26c54aaea256d2566eaa040a3535601f49a62d79187e77d9ba9f9"},
511511
{"name":"parallel","version":"1.26.3","platform":"ruby","checksum":"d86babb7a2b814be9f4b81587bf0b6ce2da7d45969fab24d8ae4bf2bb4d4c7ef"},
512-
{"name":"parser","version":"3.3.7.1","platform":"ruby","checksum":"7dbe61618025519024ac72402a6677ead02099587a5538e84371b76659e6aca1"},
512+
{"name":"parser","version":"3.3.7.4","platform":"ruby","checksum":"2b26282274280e13f891080dc4ef3f65ce658d62e13255b246b28ec6754e98ab"},
513513
{"name":"parslet","version":"1.8.2","platform":"ruby","checksum":"08d1ab3721cd3f175bfbee8788b2ddff71f92038f2d69bd65454c22bb9fbd98a"},
514514
{"name":"pastel","version":"0.8.0","platform":"ruby","checksum":"481da9fb7d2f6e6b1a08faf11fa10363172dc40fd47848f096ae21209f805a75"},
515515
{"name":"pdf-core","version":"0.10.0","platform":"ruby","checksum":"0a5d101e2063c01e3f941e1ee47cbb97f1adfc1395b58372f4f65f1300f3ce91"},

‎Gemfile.lock

+11-9
Original file line numberDiff line numberDiff line change
@@ -358,16 +358,18 @@ GEM
358358
aws-sdk-cloudformation (1.41.0)
359359
aws-sdk-core (~> 3, >= 3.99.0)
360360
aws-sigv4 (~> 1.1)
361-
aws-sdk-core (3.215.0)
361+
aws-sdk-core (3.222.2)
362362
aws-eventstream (~> 1, >= 1.3.0)
363363
aws-partitions (~> 1, >= 1.992.0)
364364
aws-sigv4 (~> 1.9)
365+
base64
365366
jmespath (~> 1, >= 1.6.1)
367+
logger
366368
aws-sdk-kms (1.76.0)
367369
aws-sdk-core (~> 3, >= 3.188.0)
368370
aws-sigv4 (~> 1.1)
369-
aws-sdk-s3 (1.177.0)
370-
aws-sdk-core (~> 3, >= 3.210.0)
371+
aws-sdk-s3 (1.183.0)
372+
aws-sdk-core (~> 3, >= 3.216.0)
371373
aws-sdk-kms (~> 1)
372374
aws-sigv4 (~> 1.5)
373375
aws-sigv4 (1.9.1)
@@ -533,7 +535,7 @@ GEM
533535
thor (>= 0.19, < 2)
534536
descendants_tracker (0.0.4)
535537
thread_safe (~> 0.3, >= 0.3.1)
536-
devfile (0.4.0)
538+
devfile (0.4.3)
537539
device_detector (1.0.0)
538540
devise (4.9.4)
539541
bcrypt (~> 3.0)
@@ -1458,7 +1460,7 @@ GEM
14581460
activerecord (>= 6.1)
14591461
request_store (~> 1.4)
14601462
parallel (1.26.3)
1461-
parser (3.3.7.1)
1463+
parser (3.3.7.4)
14621464
ast (~> 2.4.1)
14631465
racc
14641466
parslet (1.8.2)
@@ -2078,8 +2080,8 @@ DEPENDENCIES
20782080
attr_encrypted (~> 3.2.4)!
20792081
awesome_print
20802082
aws-sdk-cloudformation (~> 1)
2081-
aws-sdk-core (~> 3.215.0)
2082-
aws-sdk-s3 (~> 1.177.0)
2083+
aws-sdk-core (~> 3.222.0)
2084+
aws-sdk-s3 (~> 1.183.0)
20832085
axe-core-rspec (~> 4.10.0)
20842086
babosa (~> 2.0)
20852087
base32 (~> 0.3.0)
@@ -2114,7 +2116,7 @@ DEPENDENCIES
21142116
declarative_policy (~> 1.1.0)
21152117
deprecation_toolkit (~> 1.5.1)
21162118
derailed_benchmarks
2117-
devfile (~> 0.4.0)
2119+
devfile (~> 0.4.3)
21182120
device_detector
21192121
devise (~> 4.9.3)
21202122
devise-pbkdf2-encryptable (~> 0.0.0)!
@@ -2316,7 +2318,7 @@ DEPENDENCIES
23162318
pact (~> 1.64)
23172319
paper_trail (~> 15.0)
23182320
parallel (~> 1.19)
2319-
parser (= 3.3.7.1)
2321+
parser (= 3.3.7.4)
23202322
parslet (~> 1.8)
23212323
peek (~> 1.1)
23222324
pg (~> 1.5.6)

‎Gemfile.next.checksum

+7-7
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
{"name":"aws-eventstream","version":"1.3.0","platform":"ruby","checksum":"f1434cc03ab2248756eb02cfa45e900e59a061d7fbdc4a9fd82a5dd23d796d3f"},
3737
{"name":"aws-partitions","version":"1.1001.0","platform":"ruby","checksum":"2979f3317d3a757508d35d0f322839f422cbc8459589b7cc4a3889d0085a8307"},
3838
{"name":"aws-sdk-cloudformation","version":"1.41.0","platform":"ruby","checksum":"31e47539719734413671edf9b1a31f8673fbf9688549f50c41affabbcb1c6b26"},
39-
{"name":"aws-sdk-core","version":"3.215.0","platform":"ruby","checksum":"214168fb749e1209a87ecf3ed1c93277976f9739883263b7478d052ccc6e4e49"},
39+
{"name":"aws-sdk-core","version":"3.222.2","platform":"ruby","checksum":"0639070595c6d123fc371d773a2a86f9fc208466ec88e9763d7af924a757c8d1"},
4040
{"name":"aws-sdk-kms","version":"1.76.0","platform":"ruby","checksum":"e7f75013cba9ba357144f66bbc600631c192e2cda9dd572794be239654e2cf49"},
41-
{"name":"aws-sdk-s3","version":"1.177.0","platform":"ruby","checksum":"bf2fd9210c3e534f2bd4d90cf855429859bdbfc1911f4d61045a3aaa3ff2f183"},
41+
{"name":"aws-sdk-s3","version":"1.183.0","platform":"ruby","checksum":"8c06b0330c76fc57b4a04a94aec25a8474160b05b2436334d9f8e57ea2799f4c"},
4242
{"name":"aws-sigv4","version":"1.9.1","platform":"ruby","checksum":"7753e320c39f80f82f9e0883b30de0e7b99e756adbaedc80c50b6ad59d49c379"},
4343
{"name":"axe-core-api","version":"4.10.3","platform":"ruby","checksum":"6e10f3ed1c031804f16e8154d9d5dc658564d10850cee860e125fe665c3f0148"},
4444
{"name":"axe-core-rspec","version":"4.10.3","platform":"ruby","checksum":"ca21d0111e2d0fcd0f1da922c9071337336732aa6a3a8dc21bed94c9a701527e"},
@@ -113,10 +113,10 @@
113113
{"name":"deprecation_toolkit","version":"1.5.1","platform":"ruby","checksum":"a8a1ab1a19ae40ea12560b65010e099f3459ebde390b76621ef0c21c516a04ba"},
114114
{"name":"derailed_benchmarks","version":"2.2.1","platform":"ruby","checksum":"654280664fded41c9cd8fc27fc0fcfaf096023afab90eb4ac1185ba70c5d4439"},
115115
{"name":"descendants_tracker","version":"0.0.4","platform":"ruby","checksum":"e9c41dd4cfbb85829a9301ea7e7c48c2a03b26f09319db230e6479ccdc780897"},
116-
{"name":"devfile","version":"0.4.0","platform":"aarch64-linux","checksum":"ca9a030210755023608e8f853794c0006ebd1acff2b0f54a47202a9bf98a8bce"},
117-
{"name":"devfile","version":"0.4.0","platform":"arm64-darwin","checksum":"99588818b3833373236af0cf0559932a4dac4ee6fa017fa7f8885e6acb83a7e3"},
118-
{"name":"devfile","version":"0.4.0","platform":"ruby","checksum":"885b7728dae945582321364346f5bb59c4f92457f6cea2231c30ad1e5a168af9"},
119-
{"name":"devfile","version":"0.4.0","platform":"x86_64-linux","checksum":"942fb20bce2a13a58ec58632ce1c7a1323cc7e95819e39b548529044b4ad89bc"},
116+
{"name":"devfile","version":"0.4.3","platform":"aarch64-linux","checksum":"c603ed2d57eef71b7233b68816c37dffc3ce51a2ac3ce81ea4cb1e00c2fb9cb7"},
117+
{"name":"devfile","version":"0.4.3","platform":"arm64-darwin","checksum":"12f0eec17100b11c3f6afa573b0dd49aa84b4cfd1d25401f6b9aa05fd975123e"},
118+
{"name":"devfile","version":"0.4.3","platform":"ruby","checksum":"5ab6061a9848f6f7f387767326f6f77ef068347656ea63db0917a3f5fbdd74fd"},
119+
{"name":"devfile","version":"0.4.3","platform":"x86_64-linux","checksum":"d3077aaa037dd35b5ff92c5d3b2f167f98a5844fb1db4b76afbe4500ad6fbe03"},
120120
{"name":"device_detector","version":"1.0.0","platform":"ruby","checksum":"b800fb3150b00c23e87b6768011808ac1771fffaae74c3238ebaf2b782947a7d"},
121121
{"name":"devise","version":"4.9.4","platform":"ruby","checksum":"920042fe5e704c548aa4eb65ebdd65980b83ffae67feb32c697206bfd975a7f8"},
122122
{"name":"devise-two-factor","version":"4.1.1","platform":"ruby","checksum":"c95f5b07533e62217aaed3c386874d94e2d472fb5f2b6598afe8600fc17a8b95"},
@@ -509,7 +509,7 @@
509509
{"name":"pact-support","version":"1.20.0","platform":"ruby","checksum":"41c343a3124fb379684b9ad9f1a0766c5fa18d3b78d433a52e5552d8b9475871"},
510510
{"name":"paper_trail","version":"15.1.0","platform":"ruby","checksum":"0dbccd97e9d26c54aaea256d2566eaa040a3535601f49a62d79187e77d9ba9f9"},
511511
{"name":"parallel","version":"1.26.3","platform":"ruby","checksum":"d86babb7a2b814be9f4b81587bf0b6ce2da7d45969fab24d8ae4bf2bb4d4c7ef"},
512-
{"name":"parser","version":"3.3.7.1","platform":"ruby","checksum":"7dbe61618025519024ac72402a6677ead02099587a5538e84371b76659e6aca1"},
512+
{"name":"parser","version":"3.3.7.4","platform":"ruby","checksum":"2b26282274280e13f891080dc4ef3f65ce658d62e13255b246b28ec6754e98ab"},
513513
{"name":"parslet","version":"1.8.2","platform":"ruby","checksum":"08d1ab3721cd3f175bfbee8788b2ddff71f92038f2d69bd65454c22bb9fbd98a"},
514514
{"name":"pastel","version":"0.8.0","platform":"ruby","checksum":"481da9fb7d2f6e6b1a08faf11fa10363172dc40fd47848f096ae21209f805a75"},
515515
{"name":"pdf-core","version":"0.10.0","platform":"ruby","checksum":"0a5d101e2063c01e3f941e1ee47cbb97f1adfc1395b58372f4f65f1300f3ce91"},

‎Gemfile.next.lock

+11-9
Original file line numberDiff line numberDiff line change
@@ -358,16 +358,18 @@ GEM
358358
aws-sdk-cloudformation (1.41.0)
359359
aws-sdk-core (~> 3, >= 3.99.0)
360360
aws-sigv4 (~> 1.1)
361-
aws-sdk-core (3.215.0)
361+
aws-sdk-core (3.222.2)
362362
aws-eventstream (~> 1, >= 1.3.0)
363363
aws-partitions (~> 1, >= 1.992.0)
364364
aws-sigv4 (~> 1.9)
365+
base64
365366
jmespath (~> 1, >= 1.6.1)
367+
logger
366368
aws-sdk-kms (1.76.0)
367369
aws-sdk-core (~> 3, >= 3.188.0)
368370
aws-sigv4 (~> 1.1)
369-
aws-sdk-s3 (1.177.0)
370-
aws-sdk-core (~> 3, >= 3.210.0)
371+
aws-sdk-s3 (1.183.0)
372+
aws-sdk-core (~> 3, >= 3.216.0)
371373
aws-sdk-kms (~> 1)
372374
aws-sigv4 (~> 1.5)
373375
aws-sigv4 (1.9.1)
@@ -533,7 +535,7 @@ GEM
533535
thor (>= 0.19, < 2)
534536
descendants_tracker (0.0.4)
535537
thread_safe (~> 0.3, >= 0.3.1)
536-
devfile (0.4.0)
538+
devfile (0.4.3)
537539
device_detector (1.0.0)
538540
devise (4.9.4)
539541
bcrypt (~> 3.0)
@@ -1458,7 +1460,7 @@ GEM
14581460
activerecord (>= 6.1)
14591461
request_store (~> 1.4)
14601462
parallel (1.26.3)
1461-
parser (3.3.7.1)
1463+
parser (3.3.7.4)
14621464
ast (~> 2.4.1)
14631465
racc
14641466
parslet (1.8.2)
@@ -2078,8 +2080,8 @@ DEPENDENCIES
20782080
attr_encrypted (~> 3.2.4)!
20792081
awesome_print
20802082
aws-sdk-cloudformation (~> 1)
2081-
aws-sdk-core (~> 3.215.0)
2082-
aws-sdk-s3 (~> 1.177.0)
2083+
aws-sdk-core (~> 3.222.0)
2084+
aws-sdk-s3 (~> 1.183.0)
20832085
axe-core-rspec (~> 4.10.0)
20842086
babosa (~> 2.0)
20852087
base32 (~> 0.3.0)
@@ -2114,7 +2116,7 @@ DEPENDENCIES
21142116
declarative_policy (~> 1.1.0)
21152117
deprecation_toolkit (~> 1.5.1)
21162118
derailed_benchmarks
2117-
devfile (~> 0.4.0)
2119+
devfile (~> 0.4.3)
21182120
device_detector
21192121
devise (~> 4.9.3)
21202122
devise-pbkdf2-encryptable (~> 0.0.0)!
@@ -2316,7 +2318,7 @@ DEPENDENCIES
23162318
pact (~> 1.64)
23172319
paper_trail (~> 15.0)
23182320
parallel (~> 1.19)
2319-
parser (= 3.3.7.1)
2321+
parser (= 3.3.7.4)
23202322
parslet (~> 1.8)
23212323
peek (~> 1.1)
23222324
pg (~> 1.5.6)

‎app/assets/javascripts/ci/job_details/components/sidebar/sidebar_job_details_container.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,11 @@ export default {
137137
parent_pipeline: s__('JobSource|Parent Pipeline'),
138138
pipeline: s__('JobSource|Pipeline'),
139139
pipeline_execution_policy: s__('JobSource|Pipeline Execution Policy'),
140-
pipeline_execution_policy_schedule: s__('JobSource|Pipeline Execution Policy Schedule'),
140+
pipeline_execution_policy_schedule: s__('JobSource|Scheduled Pipeline Execution Policy'),
141141
push: s__('JobSource|Push'),
142142
scan_execution_policy: s__('JobSource|Scan Execution Policy'),
143143
schedule: s__('JobSource|Schedule'),
144-
security_orchestration_policy: s__('JobSource|Security Orchestration Policy'),
144+
security_orchestration_policy: s__('JobSource|Scheduled Scan Execution Policy'),
145145
trigger: s__('JobSource|Trigger'),
146146
web: s__('JobSource|Web'),
147147
webide: s__('JobSource|Web IDE'),

‎app/assets/javascripts/import_entities/import_groups/components/import_actions_cell.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ export default {
129129
<gl-sprintf
130130
:message="
131131
s__(
132-
`BulkImport|Because of settings on the source GitLab instance or group, you can't import projects with this group. To permit importing projects with this group, reconfigure the source GitLab instance or group. %{linkStart}Learn more.%{linkEnd}`,
132+
`BulkImport|You cannot import projects with this group. To import projects, reconfigure the source GitLab instance or group. %{linkStart}Learn more.%{linkEnd}`,
133133
)
134134
"
135135
>

‎app/assets/javascripts/import_entities/import_groups/components/import_table.vue

+9-8
Original file line numberDiff line numberDiff line change
@@ -277,10 +277,13 @@ export default {
277277
},
278278
279279
unavailableFeaturesAlertTitle() {
280-
return sprintf(s__('BulkImport| %{host} is running outdated GitLab version (v%{version})'), {
281-
host: this.sourceUrl,
282-
version: this.bulkImportSourceGroups.versionValidation.features.sourceInstanceVersion,
283-
});
280+
return sprintf(
281+
s__('BulkImport|%{host} is running an outdated GitLab version (v%{version})'),
282+
{
283+
host: this.sourceUrl,
284+
version: this.bulkImportSourceGroups.versionValidation.features.sourceInstanceVersion,
285+
},
286+
);
284287
},
285288
286289
pageInfo() {
@@ -701,7 +704,7 @@ export default {
701704
<gl-sprintf
702705
:message="
703706
s__(
704-
'BulkImport|Following data will not be migrated: %{bullets} Contact system administrator of %{host} to upgrade GitLab if you need this data in your migration',
707+
'BulkImport|The following items are not migrated: %{bullets} To include these items, ask the administrator of %{host} to upgrade GitLab.',
705708
)
706709
"
707710
>
@@ -764,9 +767,7 @@ export default {
764767
<help-popover :options="$options.popoverOptions">
765768
<gl-sprintf
766769
:message="
767-
s__(
768-
'BulkImport|Only groups that you have the %{role} role for are listed as groups you can import.',
769-
)
770+
s__('BulkImport|Only groups you have the %{role} role for are listed for import.')
770771
"
771772
>
772773
<template #role>

‎app/assets/javascripts/import_entities/import_groups/constants.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ export const i18n = {
55
ERROR_INVALID_FORMAT: s__(
66
'GroupSettings|Please choose a group URL with no special characters or spaces.',
77
),
8-
ERROR_NAME_ALREADY_EXISTS: s__('BulkImport|Name already exists.'),
8+
ERROR_NAME_ALREADY_EXISTS: s__('BulkImport|This name already exists.'),
99
ERROR_REQUIRED: __('This field is required.'),
1010
ERROR_NAME_ALREADY_USED_IN_SUGGESTION: s__(
11-
'BulkImport|Name already used as a target for another group.',
11+
'BulkImport|This name is already used for another group.',
1212
),
1313
ERROR_IMPORT: s__('BulkImport|Importing the group failed.'),
14-
ERROR_IMPORT_COMPLETED: s__('BulkImport|Import is finished. Pick another name for re-import'),
14+
ERROR_IMPORT_COMPLETED: s__('BulkImport|Enter another name to re-import.'),
1515
ERROR_TOO_MANY_REQUESTS: s__(
1616
'Bulkmport|Over six imports in one minute were attempted. Wait at least one minute and try again.',
1717
),

‎app/assets/javascripts/projects/pipelines/charts/components/pipelines_dashboard_clickhouse_filters.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ const sourcesItems = [
5454
},
5555
{
5656
value: SOURCE_SECURITY_ORCHESTRATION_POLICY,
57-
text: s__('PipelineSource|Security Orchestration Policy'),
57+
text: s__('PipelineSource|Scheduled Scan Execution Policy'),
5858
},
5959
{ value: SOURCE_CONTAINER_REGISTRY_PUSH, text: s__('PipelineSource|Container Registry Push') },
6060
{ value: SOURCE_DUO_WORKFLOW, text: s__('PipelineSource|Duo Workflow') },
6161
{
6262
value: SOURCE_PIPELINE_EXECUTION_POLICY_SCHEDULE,
63-
text: s__('PipelineSource|Pipeline Execution Policy Schedule'),
63+
text: s__('PipelineSource|Scheduled Pipeline Execution Policy'),
6464
},
6565
{ value: SOURCE_UNKNOWN, text: s__('PipelineSource|Unknown') },
6666
];

‎app/models/bulk_imports/entity.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ def propagate_cancel
242242
def validate_only_one_sharding_key_present
243243
return if [group, project, organization].compact.one?
244244

245-
errors.add(:base, s_("BulkImport|Import failed: Must have exactly one of organization, group or project."))
245+
errors.add(:base, s_("BulkImport|Import failed. The bulk import entity must belong to only one organization, group, or project."))
246246
end
247247

248248
def validate_parent_is_a_group
@@ -275,7 +275,7 @@ def validate_destination_namespace_ascendency
275275
if source.self_and_descendants.any? { |namespace| namespace.full_path == destination_namespace }
276276
errors.add(
277277
:base,
278-
s_('BulkImport|Import failed: Destination cannot be a subgroup of the source group. Change the destination and try again.')
278+
s_('BulkImport|Import failed. The destination cannot be a subgroup of the source group. Change the destination and try again.')
279279
)
280280
end
281281
end

0 commit comments

Comments
 (0)