Skip to content

Commit 81aa45e

Browse files
author
GitLab Bot
committed
Add latest changes from gitlab-org/gitlab@master
1 parent 6438760 commit 81aa45e

File tree

148 files changed

+1887
-464
lines changed

Some content is hidden

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

148 files changed

+1887
-464
lines changed

‎.rubocop_todo/rspec/receive_messages.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ RSpec/ReceiveMessages:
109109
- 'ee/spec/models/namespace_setting_spec.rb'
110110
- 'ee/spec/models/namespaces/storage/enforcement_spec.rb'
111111
- 'ee/spec/models/project_feature_spec.rb'
112-
- 'ee/spec/models/search/zoekt/index_spec.rb'
113112
- 'ee/spec/models/security/scan_result_policy_read_spec.rb'
114113
- 'ee/spec/policies/global_policy_spec.rb'
115114
- 'ee/spec/policies/issue_policy_spec.rb'

‎CHANGELOG.md

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
22
documentation](doc/development/changelog.md) for instructions on adding your own
33
entry.
44

5+
## 17.6.1 (2024-11-26)
6+
7+
### Security (6 changes)
8+
9+
- [Add size check for harbor registry](https://gitlab.com/gitlab-org/security/gitlab/-/commit/48579cdb744f994dc0fb2b4f96b1ada3e94a59e6) ([merge request](https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4614))
10+
- [Adding JobArtifactReport class to pre-emptively validate job artifacts](https://gitlab.com/gitlab-org/security/gitlab/-/commit/83f0e6c1ea1ea6a82e8cf7bdfec0944990f8ec23) ([merge request](https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4616))
11+
- [Fix: unsubscribe from actioncable channel when PAT is revoked](https://gitlab.com/gitlab-org/security/gitlab/-/commit/302ed663e0d9a68c413732e9d7a260b6be1b477d) ([merge request](https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4621))
12+
- [Allow a LFS token to be used only for LFS related requests](https://gitlab.com/gitlab-org/security/gitlab/-/commit/800c79606ab237536ea5cf9a29e541855fc01477) ([merge request](https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4613))
13+
- [Fix possible DOS with TOML file parsing](https://gitlab.com/gitlab-org/security/gitlab/-/commit/7b6057a43cd11aae5a5e8f2f91c76a90a4310ec2) ([merge request](https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4617))
14+
- [Move allow_access_with_scope to class level](https://gitlab.com/gitlab-org/security/gitlab/-/commit/b70cb1e7d430bbbcd8da22b33e7d07cb136189d7) ([merge request](https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4610))
15+
516
## 17.6.0 (2024-11-20)
617

718
### Added (181 changes)
@@ -984,6 +995,21 @@ entry.
984995
- [Quarantine a flaky test](https://gitlab.com/gitlab-org/gitlab/-/commit/7427f68ca476bd1294900155a2a93b470ef888a6) ([merge request](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/165742))
985996
- [Quarantine a flaky test](https://gitlab.com/gitlab-org/gitlab/-/commit/81ccade46593d99c938fd8ab03c2e299f6f62377) ([merge request](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/164711))
986997

998+
## 17.5.3 (2024-11-26)
999+
1000+
### Fixed (1 change)
1001+
1002+
- [Ensure auto_merge_enabled is set when validating merge trains](https://gitlab.com/gitlab-org/security/gitlab/-/commit/91ef505e1e984525a22a92fefc6e88bfd6b55a14) **GitLab Enterprise Edition**
1003+
1004+
### Security (6 changes)
1005+
1006+
- [Add size check for harbor registry](https://gitlab.com/gitlab-org/security/gitlab/-/commit/7aea8120573400b49f7cf99dfa775604a2c8255f) ([merge request](https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4599))
1007+
- [Adding JobArtifactReport class to pre-emptively validate job artifacts](https://gitlab.com/gitlab-org/security/gitlab/-/commit/6702ca1b2f320429abf67741b70a969b8dee4185) ([merge request](https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4568))
1008+
- [Fix: unsubscribe from actioncable channel when PAT is revoked](https://gitlab.com/gitlab-org/security/gitlab/-/commit/793476f8556c7db20633093e993298e8247ed1d4) ([merge request](https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4550))
1009+
- [Allow a LFS token to be used only for LFS related requests](https://gitlab.com/gitlab-org/security/gitlab/-/commit/bc1281f297568cffe9f9ef9c4ddfdeb819dbc319) ([merge request](https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4582))
1010+
- [Fix possible DOS with TOML file parsing](https://gitlab.com/gitlab-org/security/gitlab/-/commit/7938b04aeae9ed9b6f75429367613df4b57d12b3) ([merge request](https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4590))
1011+
- [Move allow_access_with_scope to class level](https://gitlab.com/gitlab-org/security/gitlab/-/commit/31ee3de85aa7a92e6ade8cb3a6dab69505d3cee6) ([merge request](https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4611))
1012+
9871013
## 17.5.2 (2024-11-12)
9881014

9891015
### Fixed (4 changes)
@@ -1738,6 +1764,17 @@ entry.
17381764
- [Adjust signup page items for more clarity](https://gitlab.com/gitlab-org/gitlab/-/commit/e272c8a4c7b243758454d6f15363d0c13ca05c04) ([merge request](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/165202)) **GitLab Enterprise Edition**
17391765
- [Removes Unused CSS class](https://gitlab.com/gitlab-org/gitlab/-/commit/4e17154650ee4afc8b1ae4238d27efb908855a19) by @NIKU-SINGH ([merge request](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/164637))
17401766

1767+
## 17.4.5 (2024-11-26)
1768+
1769+
### Security (6 changes)
1770+
1771+
- [Add size check for harbor registry](https://gitlab.com/gitlab-org/security/gitlab/-/commit/93805df2b9133610fe045d610c17bec383b990aa) ([merge request](https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4600))
1772+
- [Adding JobArtifactReport class to pre-emptively validate job artifacts](https://gitlab.com/gitlab-org/security/gitlab/-/commit/abd3445326649da3da1a32e216f607545c6c9225) ([merge request](https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4569))
1773+
- [Fix: unsubscribe from actioncable channel when PAT is revoked](https://gitlab.com/gitlab-org/security/gitlab/-/commit/22187161c0d97776307d6693151495b340bb3824) ([merge request](https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4554))
1774+
- [Allow a LFS token to be used only for LFS related requests](https://gitlab.com/gitlab-org/security/gitlab/-/commit/8f04fa2b2ad7366f657bd4b2b8c3924d8f151b59) ([merge request](https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4583))
1775+
- [Fix possible DOS with TOML file parsing](https://gitlab.com/gitlab-org/security/gitlab/-/commit/4288df0f8fdd834a803295d0f9b3c8d2a8f1395e) ([merge request](https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4589))
1776+
- [Move allow_access_with_scope to class level](https://gitlab.com/gitlab-org/security/gitlab/-/commit/5fa7098500495b435f3de740e2768f5f6d24c8db) ([merge request](https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4612))
1777+
17411778
## 17.4.4 (2024-11-12)
17421779

17431780
### Fixed (4 changes)

‎GITALY_SERVER_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8772e7bbd79d8fd2ba9137eef510b22fa2f8382f
1+
275f2266ac911d785aaf7f5f79dd76240f372a7f

‎app/assets/javascripts/access_level/constants.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ export const ACCESS_LEVEL_LABELS = {
116116
[ACCESS_LEVEL_NO_ACCESS_INTEGER]: ACCESS_LEVEL_NO_ACCESS,
117117
[ACCESS_LEVEL_MINIMAL_ACCESS_INTEGER]: ACCESS_LEVEL_MINIMAL_ACCESS,
118118
[ACCESS_LEVEL_GUEST_INTEGER]: ACCESS_LEVEL_GUEST,
119+
[ACCESS_LEVEL_PLANNER_INTEGER]: ACCESS_LEVEL_PLANNER,
119120
[ACCESS_LEVEL_REPORTER_INTEGER]: ACCESS_LEVEL_REPORTER,
120121
[ACCESS_LEVEL_DEVELOPER_INTEGER]: ACCESS_LEVEL_DEVELOPER,
121122
[ACCESS_LEVEL_MAINTAINER_INTEGER]: ACCESS_LEVEL_MAINTAINER,

‎app/assets/javascripts/ide/init_gitlab_web_ide.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ export const initGitlabWebIDE = async (el) => {
5959
'X-Requested-With': 'XMLHttpRequest',
6060
};
6161

62+
const isLanguageServerEnabled = gon.features.webIdeLanguageServer || false;
63+
6264
try {
6365
// See ClientOnlyConfig https://gitlab.com/gitlab-org/gitlab-web-ide/-/blob/main/packages/web-ide-types/src/config.ts#L17
6466
await start(rootEl, {
@@ -80,6 +82,7 @@ export const initGitlabWebIDE = async (el) => {
8082
},
8183
featureFlags: {
8284
crossOriginExtensionHost: getCrossOriginExtensionHostFlagValue(extensionsGallerySettings),
85+
languageServerWebIDE: isLanguageServerEnabled,
8386
},
8487
editorFont,
8588
extensionsGallerySettings,

‎app/assets/javascripts/pages/projects/blob/show/index.js

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
import Vue from 'vue';
22
// eslint-disable-next-line no-restricted-imports
33
import Vuex from 'vuex';
4+
import { GlButton } from '@gitlab/ui';
45
import VueApollo from 'vue-apollo';
56
import VueRouter from 'vue-router';
67
import { provideWebIdeLink } from 'ee_else_ce/pages/projects/shared/web_ide_link/provide_web_ide_link';
78
import TableOfContents from '~/blob/components/table_contents.vue';
89
import { BlobViewer, initAuxiliaryViewer } from '~/blob/viewer/index';
10+
import { __ } from '~/locale';
911
import GpgBadges from '~/gpg_badges';
1012
import createDefaultClient from '~/lib/graphql';
1113
import initBlob from '~/pages/projects/init_blob';
@@ -16,6 +18,7 @@ import BlobContentViewer from '~/repository/components/blob_content_viewer.vue';
1618
import '~/sourcegraph/load';
1719
import createStore from '~/code_navigation/store';
1820
import { generateRefDestinationPath } from '~/repository/utils/ref_switcher_utils';
21+
import { generateHistoryUrl } from '~/repository/utils/url_utility';
1922
import RefSelector from '~/ref/components/ref_selector.vue';
2023
import { joinPaths, visitUrl } from '~/lib/utils/url_utility';
2124
import { parseBoolean } from '~/lib/utils/common_utils';
@@ -205,3 +208,30 @@ if (tableContentsEl) {
205208
},
206209
});
207210
}
211+
212+
const treeHistoryLinkEl = document.getElementById('js-commit-history-link');
213+
if (treeHistoryLinkEl) {
214+
const { historyLink } = treeHistoryLinkEl.dataset;
215+
// eslint-disable-next-line no-new
216+
new Vue({
217+
el: treeHistoryLinkEl,
218+
router,
219+
render(h) {
220+
const url = generateHistoryUrl(
221+
historyLink,
222+
this.$route.params.path,
223+
this.$route.meta.refType || this.$route.query.ref_type,
224+
);
225+
return h(
226+
GlButton,
227+
{
228+
attrs: {
229+
href: url.href,
230+
category: 'tertiary',
231+
},
232+
},
233+
[__('History')],
234+
);
235+
},
236+
});
237+
}

‎app/assets/javascripts/repository/components/header_area.vue

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import { sanitize } from '~/lib/dompurify';
88
import { InternalEvents } from '~/tracking';
99
import { FIND_FILE_BUTTON_CLICK } from '~/tracking/constants';
1010
import { visitUrl, joinPaths } from '~/lib/utils/url_utility';
11-
import { generateHistoryUrl } from '~/repository/utils/url_utility';
1211
import { generateRefDestinationPath } from '~/repository/utils/ref_switcher_utils';
1312
import RefSelector from '~/ref/components/ref_selector.vue';
1413
import Breadcrumbs from '~/repository/components/header_area/breadcrumbs.vue';
@@ -19,7 +18,6 @@ export default {
1918
i18n: {
2019
compare: __('Compare'),
2120
findFile: __('Find file'),
22-
history: __('History'),
2321
},
2422
components: {
2523
GlButton,
@@ -63,10 +61,6 @@ export default {
6361
required: false,
6462
default: null,
6563
},
66-
historyLink: {
67-
type: String,
68-
required: true,
69-
},
7064
projectId: {
7165
type: String,
7266
required: true,
@@ -76,15 +70,6 @@ export default {
7670
isTreeView() {
7771
return this.$route.name !== 'blobPathDecoded';
7872
},
79-
historyPath() {
80-
const url = generateHistoryUrl(
81-
this.historyLink,
82-
this.$route.params.path,
83-
this.$route.meta.refType || this.$route.query.ref_type,
84-
);
85-
86-
return url.href;
87-
},
8873
getRefType() {
8974
return this.$route.query.ref_type;
9075
},
@@ -166,9 +151,6 @@ export default {
166151
class="shortcuts-compare"
167152
>{{ $options.i18n.compare }}</gl-button
168153
>
169-
<gl-button v-if="!isReadmeView" :href="historyPath" data-testid="tree-history-control">{{
170-
$options.i18n.history
171-
}}</gl-button>
172154
<gl-button
173155
v-gl-tooltip.html="findFileTooltip"
174156
:aria-keyshortcuts="findFileShortcutKey"

‎app/assets/javascripts/repository/components/header_area/blob_controls.vue

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,12 @@ export default {
177177
{{ $options.i18n.blame }}
178178
</gl-button>
179179
180-
<gl-button data-testid="history" :href="blobInfo.historyPath" :class="$options.buttonClassList">
180+
<gl-button
181+
data-testid="history"
182+
:href="blobInfo.historyPath"
183+
:class="$options.buttonClassList"
184+
class="gl-block sm:gl-hidden"
185+
>
181186
{{ $options.i18n.history }}
182187
</gl-button>
183188

‎app/assets/javascripts/repository/components/last_commit.vue

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@ export default {
6767
required: false,
6868
default: null,
6969
},
70+
historyUrl: {
71+
type: String,
72+
required: false,
73+
default: '',
74+
},
7075
},
7176
data() {
7277
return {
@@ -108,17 +113,18 @@ export default {
108113
109114
<template>
110115
<gl-loading-icon v-if="isLoading" size="md" color="dark" class="m-auto gl-min-h-8 gl-py-6" />
116+
111117
<commit-info v-else-if="commit" :commit="commit">
112-
<div class="commit-actions gl-flex-align gl-flex gl-flex-row gl-items-center">
118+
<div class="commit-actions gl-flex gl-items-start">
113119
<signature-badge v-if="commit.signature" :signature="commit.signature" />
114-
<div v-if="commit.pipeline" class="gl-ml-5">
120+
<div v-if="commit.pipeline" class="gl-ml-5 gl-flex gl-h-7 gl-items-center">
115121
<ci-icon
116122
:status="commit.pipeline.detailedStatus"
117123
:aria-label="statusTitle"
118124
class="js-commit-pipeline"
119125
/>
120126
</div>
121-
<gl-button-group class="js-commit-sha-group gl-ml-4">
127+
<gl-button-group class="js-commit-sha-group gl-ml-4 gl-flex gl-items-center">
122128
<gl-button label class="gl-font-monospace" data-testid="last-commit-id-label">{{
123129
showCommitId
124130
}}</gl-button>
@@ -128,6 +134,14 @@ export default {
128134
class="input-group-text"
129135
/>
130136
</gl-button-group>
137+
<gl-button
138+
category="tertiary"
139+
data-testid="last-commit-history"
140+
:href="historyUrl"
141+
class="gl-ml-4"
142+
>
143+
{{ __('History') }}
144+
</gl-button>
131145
</div>
132146
</commit-info>
133147
</template>

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,16 +116,24 @@ export default function setupVueRepositoryList() {
116116
});
117117
};
118118

119+
const lastCommitEl = document.getElementById('js-last-commit');
120+
119121
const initLastCommitApp = () =>
120122
new Vue({
121-
el: document.getElementById('js-last-commit'),
123+
el: lastCommitEl,
122124
router,
123125
apolloProvider,
124126
render(h) {
127+
const historyUrl = generateHistoryUrl(
128+
lastCommitEl.dataset.historyLink,
129+
this.$route.params.path,
130+
this.$route.meta.refType || this.$route.query.ref_type,
131+
);
125132
return h(LastCommit, {
126133
props: {
127134
currentPath: this.$route.params.path,
128135
refType: this.$route.meta.refType || this.$route.query.ref_type,
136+
historyUrl: historyUrl.href,
129137
},
130138
});
131139
},

‎app/assets/javascripts/repository/init_header_app.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ export default function initHeaderApp(isReadmeView = false) {
88
const headerEl = document.getElementById('js-repository-blob-header-app');
99
if (headerEl) {
1010
const {
11-
historyLink,
1211
ref,
1312
escapedRef,
1413
refType,
@@ -58,7 +57,6 @@ export default function initHeaderApp(isReadmeView = false) {
5857
props: {
5958
refType,
6059
currentRef: ref,
61-
historyLink,
6260
// BlobControls:
6361
projectPath,
6462
// RefSelector:

‎app/assets/javascripts/repository/utils/url_utility.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ export function generateHistoryUrl(historyLink, path, refType) {
44
const url = new URL(window.location.href);
55

66
url.pathname = joinPaths(historyLink, path ? escapeFileUrl(path) : '');
7-
url.searchParams.set('ref_type', refType);
7+
8+
if (refType) {
9+
url.searchParams.set('ref_type', refType);
10+
}
811

912
return url;
1013
}

‎app/assets/javascripts/vue_merge_request_widget/components/states/commit_message_dropdown.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ export default {
4343

4444
<template>
4545
<gl-button-group>
46-
{{ aiCommitMessageEnabled }}
4746
<ai-commit-message
4847
v-if="aiCommitMessageEnabled"
4948
:id="mrId"

0 commit comments

Comments
 (0)