Skip to content

Commit 6338012

Browse files
author
GitLab Bot
committed
Add latest changes from gitlab-org/gitlab@master
1 parent 247d342 commit 6338012

File tree

61 files changed

+846
-653
lines changed

Some content is hidden

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

61 files changed

+846
-653
lines changed

‎GITLAB_KAS_VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
d02aa3b4de57ed8a1a53156be2909b7199659e6c
1+
66973fd96a9569b322fe33c2582d82c6773f19cd

‎Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ group :development do
503503
end
504504

505505
group :development, :test do
506-
gem 'deprecation_toolkit', '~> 1.5.1', require: false, feature_category: :shared
506+
gem 'deprecation_toolkit', '~> 2.2.3', require: false, feature_category: :shared
507507
gem 'bullet', '~> 7.2.0', feature_category: :shared
508508
gem 'parser', '= 3.3.7.4', feature_category: :shared
509509
gem 'pry-byebug', feature_category: :shared

‎Gemfile.checksum

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
{"name":"deckar01-task_list","version":"2.3.4","platform":"ruby","checksum":"66abdc7e009ea759732bb53867e1ea42de550e2aa03ac30a015cbf42a04c1667"},
111111
{"name":"declarative","version":"0.0.20","platform":"ruby","checksum":"8021dd6cb17ab2b61233c56903d3f5a259c5cf43c80ff332d447d395b17d9ff9"},
112112
{"name":"declarative_policy","version":"1.1.0","platform":"ruby","checksum":"9af4cf299ade03f2bbf63908f2ce6a117d132fc714c39a128596667fb13331cb"},
113-
{"name":"deprecation_toolkit","version":"1.5.1","platform":"ruby","checksum":"a8a1ab1a19ae40ea12560b65010e099f3459ebde390b76621ef0c21c516a04ba"},
113+
{"name":"deprecation_toolkit","version":"2.2.3","platform":"ruby","checksum":"8b21d11684a4792b8e1d09faa4748970fbf4cec93f6f0ec47e57e8b71528124d"},
114114
{"name":"derailed_benchmarks","version":"2.2.1","platform":"ruby","checksum":"654280664fded41c9cd8fc27fc0fcfaf096023afab90eb4ac1185ba70c5d4439"},
115115
{"name":"descendants_tracker","version":"0.0.4","platform":"ruby","checksum":"e9c41dd4cfbb85829a9301ea7e7c48c2a03b26f09319db230e6479ccdc780897"},
116116
{"name":"devfile","version":"0.4.3","platform":"aarch64-linux","checksum":"c603ed2d57eef71b7233b68816c37dffc3ce51a2ac3ce81ea4cb1e00c2fb9cb7"},

‎Gemfile.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -514,8 +514,8 @@ GEM
514514
html-pipeline (~> 2.0)
515515
declarative (0.0.20)
516516
declarative_policy (1.1.0)
517-
deprecation_toolkit (1.5.1)
518-
activesupport (>= 4.2)
517+
deprecation_toolkit (2.2.3)
518+
activesupport (>= 6.1)
519519
derailed_benchmarks (2.2.1)
520520
base64
521521
benchmark-ips (~> 2)
@@ -2115,7 +2115,7 @@ DEPENDENCIES
21152115
database_cleaner-active_record (~> 2.2.0)
21162116
deckar01-task_list (= 2.3.4)
21172117
declarative_policy (~> 1.1.0)
2118-
deprecation_toolkit (~> 1.5.1)
2118+
deprecation_toolkit (~> 2.2.3)
21192119
derailed_benchmarks
21202120
devfile (~> 0.4.3)
21212121
device_detector

‎Gemfile.next.checksum

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
{"name":"deckar01-task_list","version":"2.3.4","platform":"ruby","checksum":"66abdc7e009ea759732bb53867e1ea42de550e2aa03ac30a015cbf42a04c1667"},
111111
{"name":"declarative","version":"0.0.20","platform":"ruby","checksum":"8021dd6cb17ab2b61233c56903d3f5a259c5cf43c80ff332d447d395b17d9ff9"},
112112
{"name":"declarative_policy","version":"1.1.0","platform":"ruby","checksum":"9af4cf299ade03f2bbf63908f2ce6a117d132fc714c39a128596667fb13331cb"},
113-
{"name":"deprecation_toolkit","version":"1.5.1","platform":"ruby","checksum":"a8a1ab1a19ae40ea12560b65010e099f3459ebde390b76621ef0c21c516a04ba"},
113+
{"name":"deprecation_toolkit","version":"2.2.3","platform":"ruby","checksum":"8b21d11684a4792b8e1d09faa4748970fbf4cec93f6f0ec47e57e8b71528124d"},
114114
{"name":"derailed_benchmarks","version":"2.2.1","platform":"ruby","checksum":"654280664fded41c9cd8fc27fc0fcfaf096023afab90eb4ac1185ba70c5d4439"},
115115
{"name":"descendants_tracker","version":"0.0.4","platform":"ruby","checksum":"e9c41dd4cfbb85829a9301ea7e7c48c2a03b26f09319db230e6479ccdc780897"},
116116
{"name":"devfile","version":"0.4.3","platform":"aarch64-linux","checksum":"c603ed2d57eef71b7233b68816c37dffc3ce51a2ac3ce81ea4cb1e00c2fb9cb7"},

‎Gemfile.next.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -514,8 +514,8 @@ GEM
514514
html-pipeline (~> 2.0)
515515
declarative (0.0.20)
516516
declarative_policy (1.1.0)
517-
deprecation_toolkit (1.5.1)
518-
activesupport (>= 4.2)
517+
deprecation_toolkit (2.2.3)
518+
activesupport (>= 6.1)
519519
derailed_benchmarks (2.2.1)
520520
base64
521521
benchmark-ips (~> 2)
@@ -2115,7 +2115,7 @@ DEPENDENCIES
21152115
database_cleaner-active_record (~> 2.2.0)
21162116
deckar01-task_list (= 2.3.4)
21172117
declarative_policy (~> 1.1.0)
2118-
deprecation_toolkit (~> 1.5.1)
2118+
deprecation_toolkit (~> 2.2.3)
21192119
derailed_benchmarks
21202120
devfile (~> 0.4.3)
21212121
device_detector

‎app/assets/javascripts/deployments/components/approvals_empty_state.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export default {
1616
bannerTitle: {
1717
type: String,
1818
required: false,
19-
default: s__('Deployment|Upgrade to get more our of your deployments'),
19+
default: s__('Deployment|Upgrade to get more out of your deployments'),
2020
},
2121
buttonText: {
2222
type: String,

‎app/assets/javascripts/merge_request_tabs.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ export default class MergeRequestTabs {
535535
if (this.createRapidDiffsApp) {
536536
if (!this.rapidDiffsApp) {
537537
this.rapidDiffsApp = this.createRapidDiffsApp();
538-
this.rapidDiffsApp.reloadDiffs();
538+
this.rapidDiffsApp.reloadDiffs(true);
539539
this.rapidDiffsApp.init();
540540
}
541541
} else {

‎app/assets/javascripts/rapid_diffs/app/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ class RapidDiffsFacade {
5757
}
5858

5959
// eslint-disable-next-line class-methods-use-this
60-
reloadDiffs() {
60+
reloadDiffs(initial) {
6161
const { reloadStreamUrl } = document.querySelector('[data-rapid-diffs]').dataset;
6262

63-
return useDiffsList(pinia).reloadDiffs(reloadStreamUrl);
63+
return useDiffsList(pinia).reloadDiffs(reloadStreamUrl, initial);
6464
}
6565

6666
#registerCustomElements() {

‎app/assets/javascripts/rapid_diffs/stores/diffs_list.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@ export const useDiffsList = defineStore('diffsList', {
8282
});
8383
});
8484
},
85-
reloadDiffs(url) {
85+
reloadDiffs(url, initial = false) {
8686
return this.withDebouncedAbortController(async ({ signal }) => {
8787
const container = document.querySelector('[data-diffs-list]');
8888
const overlay = document.querySelector('[data-diffs-overlay]');
89-
overlay.dataset.loading = 'true';
89+
if (!initial) overlay.dataset.loading = 'true';
9090
this.loadedFiles = {};
9191
this.status = statuses.fetching;
9292
const { body } = await fetch(url, { signal });

‎app/assets/javascripts/vue_shared/components/projects_list/utils.js

+2-29
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,6 @@ import {
77
import toast from '~/vue_shared/plugins/global_toast';
88
import { sprintf, __ } from '~/locale';
99

10-
const isAdjournedDeletionEnabled = (project) => {
11-
// Check if enabled at the project level or globally
12-
return (
13-
project.isAdjournedDeletionEnabled ||
14-
gon?.licensed_features?.adjournedDeletionForProjectsAndGroups
15-
);
16-
};
17-
1810
export const availableGraphQLProjectActions = ({ userPermissions, markedForDeletionOn }) => {
1911
const availableActions = [];
2012

@@ -42,11 +34,7 @@ export const renderRestoreSuccessToast = (project) => {
4234
};
4335

4436
export const renderDeleteSuccessToast = (project) => {
45-
// Delete immediately if
46-
// 1. Adjourned deletion is not enabled
47-
// 2. The project is in a personal namespace
48-
// 3. The project has already been marked for deletion
49-
if (!isAdjournedDeletionEnabled(project) || project.isPersonal || project.markedForDeletionOn) {
37+
if (!project.isAdjournedDeletionEnabled || project.markedForDeletionOn) {
5038
toast(
5139
sprintf(__("Project '%{project_name}' is being deleted."), {
5240
project_name: project.nameWithNamespace,
@@ -56,23 +44,8 @@ export const renderDeleteSuccessToast = (project) => {
5644
return;
5745
}
5846

59-
// Adjourned deletion is available for the project
60-
if (project.isAdjournedDeletionEnabled) {
61-
toast(
62-
sprintf(__("Project '%{project_name}' will be deleted on %{date}."), {
63-
project_name: project.nameWithNamespace,
64-
date: project.permanentDeletionDate,
65-
}),
66-
);
67-
68-
return;
69-
}
70-
71-
// Adjourned deletion is available globally but not at the project level.
72-
// This means we are deleting a free project. It will be deleted delayed but can only be
73-
// restored by an admin.
7447
toast(
75-
sprintf(__("Deleting project '%{project_name}'. All data will be removed on %{date}."), {
48+
sprintf(__("Project '%{project_name}' will be deleted on %{date}."), {
7649
project_name: project.nameWithNamespace,
7750
date: project.permanentDeletionDate,
7851
}),

0 commit comments

Comments
 (0)