Skip to content

Commit 9d67de3

Browse files
author
GitLab Bot
committed
Add latest changes from gitlab-org/gitlab@master
1 parent a4cfb76 commit 9d67de3

File tree

127 files changed

+1566
-298
lines changed

Some content is hidden

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

127 files changed

+1566
-298
lines changed

.eslintrc.yml

+3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ globals:
1313
IS_EE: false
1414
plugins:
1515
- no-jquery
16+
- local-rules
1617
settings:
1718
import/resolver:
1819
webpack:
@@ -152,6 +153,7 @@ rules:
152153
- '^router-link$'
153154
- '^router-view$'
154155
- '^gl-emoji$'
156+
local-rules/require-valid-help-page-path: 'error'
155157
overrides:
156158
- files:
157159
- '{,ee/,jh/}spec/frontend*/**/*'
@@ -191,6 +193,7 @@ overrides:
191193
message: '`/ee` or `/jh` path found in docs url, use `DOCS_URL_IN_EE_DIR` in `jh_else_ce/lib/utils/url_utility`'
192194
no-unsanitized/method: off
193195
no-unsanitized/property: off
196+
local-rules/require-valid-help-page-path: off
194197
- files:
195198
- 'config/**/*'
196199
- 'scripts/**/*'

.gitlab/ci/frontend.gitlab-ci.yml

+9-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ graphql-schema-dump:
216216
- .default-retry
217217
- .ruby-cache
218218
- .default-before_script
219-
- .frontend:rules:default-frontend-jobs
219+
- .frontend:rules:default-frontend-jobs-with-docs-changes
220220
stage: fixtures
221221
needs: []
222222
script:
@@ -408,6 +408,14 @@ jest-snapshot-vue3:
408408
- jest-snapshot-test-match.json
409409
- jest-snapshot-test-report.json
410410

411+
jest-linters:
412+
extends:
413+
- .frontend-test-base
414+
- .frontend:rules:jest-linters
415+
needs: []
416+
script:
417+
- run_timed_command "yarn jest:eslint --ci"
418+
411419
coverage-frontend:
412420
extends:
413421
- .default-retry

.gitlab/ci/global.gitlab-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@
322322

323323
.ai-gateway-services:
324324
services:
325-
- name: registry.gitlab.com/gitlab-org/modelops/applied-ml/code-suggestions/ai-assist/model-gateway:v1.10.0
325+
- name: registry.gitlab.com/gitlab-org/modelops/applied-ml/code-suggestions/ai-assist/model-gateway:v1.12.0
326326
alias: ai-gateway
327327

328328
.use-pg13:

.gitlab/ci/rules.gitlab-ci.yml

+12
Original file line numberDiff line numberDiff line change
@@ -1282,6 +1282,12 @@
12821282
- <<: *if-default-refs
12831283
changes: *code-backstage-patterns
12841284

1285+
.frontend:rules:default-frontend-jobs-with-docs-changes:
1286+
rules:
1287+
- !reference [.frontend:rules:default-frontend-jobs, rules]
1288+
- <<: *if-default-refs
1289+
changes: *docs-patterns
1290+
12851291
# .frontend:rules:default-frontend-jobs, with a additional rules when MR is not approved
12861292
.frontend:rules:frontend_fixture:
12871293
rules:
@@ -1458,6 +1464,12 @@
14581464
rules:
14591465
- <<: *if-default-branch-schedule-nightly
14601466

1467+
.frontend:rules:jest-linters:
1468+
rules:
1469+
- <<: *if-merge-request-labels-run-all-jest
1470+
- <<: *if-default-refs
1471+
changes: ["tooling/eslint-config/**/*", "spec/tooling/frontend/eslint-config/**/*"]
1472+
14611473
################
14621474
# Memory rules #
14631475
################

.gitlab/ci/static-analysis.gitlab-ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ static-verification-with-database:
4848
generate-apollo-graphql-schema:
4949
extends:
5050
- .static-analysis-base
51-
- .frontend:rules:default-frontend-jobs
51+
- .frontend:rules:default-frontend-jobs-with-docs-changes
5252
image:
5353
name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:apollo
5454
entrypoint: [""]
@@ -67,7 +67,7 @@ eslint:
6767
extends:
6868
- .static-analysis-base
6969
- .yarn-cache
70-
- .frontend:rules:default-frontend-jobs
70+
- .frontend:rules:default-frontend-jobs-with-docs-changes
7171
needs: ['generate-apollo-graphql-schema']
7272
variables:
7373
USE_BUNDLE_INSTALL: "false"

.markdownlint-cli2.yaml

+6-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,12 @@ config:
1616
style: "atx"
1717
hr-style: # MD035
1818
style: "---"
19-
line-length: false # MD013
19+
line-length: # MD013
20+
code_blocks: false
21+
tables: false
22+
headings: true
23+
heading_line_length: 100
24+
line_length: 800
2025
no-duplicate-heading: # MD024
2126
siblings_only: true
2227
no-emphasis-as-heading: false # MD036

app/assets/javascripts/analytics/devops_reports/components/service_ping_disabled.vue

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ export default {
2020
default: '',
2121
},
2222
},
23+
// eslint-disable-next-line local-rules/require-valid-help-page-path
2324
docsLink: helpPagePath('development/service_ping/index.md'),
2425
};
2526
</script>

app/assets/javascripts/analytics/shared/constants.js

+2
Original file line numberDiff line numberDiff line change
@@ -187,12 +187,14 @@ export const METRIC_TOOLTIPS = {
187187
description: s__('ValueStreamAnalytics|Number of new issues created.'),
188188
groupLink: '-/issues_analytics',
189189
projectLink: '-/analytics/issues_analytics',
190+
// eslint-disable-next-line local-rules/require-valid-help-page-path
190191
docsLink: helpPagePath('user/analytics/issue_analytics'),
191192
},
192193
[FLOW_METRICS.ISSUES_COMPLETED]: {
193194
description: s__('ValueStreamAnalytics|Number of issues closed by month.'),
194195
groupLink: '-/issues_analytics',
195196
projectLink: '-/analytics/issues_analytics',
197+
// eslint-disable-next-line local-rules/require-valid-help-page-path
196198
docsLink: helpPagePath('user/analytics/issue_analytics'),
197199
},
198200
[FLOW_METRICS.DEPLOYS]: {

app/assets/javascripts/boards/components/board_list.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ export default {
653653
'gl-overflow-hidden': disableScrollingWhenMutationInProgress,
654654
'gl-overflow-y-auto': !disableScrollingWhenMutationInProgress,
655655
}"
656-
draggable=".board-card"
656+
:draggable="canMoveIssue ? '.board-card' : false"
657657
class="board-list gl-w-full gl-h-full gl-list-none gl-mb-0 gl-p-3 gl-pt-0 gl-overflow-x-hidden"
658658
data-testid="tree-root-wrapper"
659659
@start="handleDragOnStart"

app/assets/javascripts/ci/job_details/components/manual_variables_form.vue

+1
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ export default {
139139
: this.$options.i18n.runButtonText;
140140
},
141141
variableSettings() {
142+
// eslint-disable-next-line local-rules/require-valid-help-page-path
142143
return helpPagePath('ci/variables/index', { anchor: 'add-a-cicd-variable-to-a-project' });
143144
},
144145
},

app/assets/javascripts/ci/pipeline_details/test_reports/test_suite_table.vue

+1
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ export default {
6767
},
6868
wrapSymbols: ['::', '#', '.', '_', '-', '/', '\\'],
6969
i18n,
70+
// eslint-disable-next-line local-rules/require-valid-help-page-path
7071
learnMorePath: helpPagePath('ci/testing/unit_test_reports', {
7172
anchor: 'viewing-unit-test-reports-on-gitlab',
7273
}),

app/assets/javascripts/ci/runner/components/runner_configuration_popover.vue

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ export default {
1010
GlSprintf,
1111
HelpPopover,
1212
},
13+
// eslint-disable-next-line local-rules/require-valid-help-page-path
1314
runnerEntryHelpPath: helpPagePath('/runner/configuration/advanced-configuration.md', {
1415
anchor: 'the-runners-section',
1516
}),

app/assets/javascripts/ci/runner/components/runner_form_fields.vue

+1
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ export default {
7575
deep: true,
7676
},
7777
},
78+
// eslint-disable-next-line local-rules/require-valid-help-page-path
7879
HELP_LABELS_PAGE_PATH: helpPagePath('ci/runners/configure_runners', {
7980
anchor: 'use-tags-to-control-which-jobs-a-runner-can-run',
8081
}),

app/assets/javascripts/environments/components/environment_folder.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export default {
6060
icons() {
6161
return this.visible
6262
? { caret: 'chevron-lg-down', folder: 'folder-open' }
63-
: { caret: 'chevron-lg-right', folder: 'folder-o' };
63+
: { caret: 'chevron-lg-right', folder: 'folder' };
6464
},
6565
label() {
6666
return this.visible ? this.$options.i18n.collapse : this.$options.i18n.expand;

app/assets/javascripts/error_tracking/components/error_tracking_list.vue

+1
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ export default {
179179
return this.pagination.next ? this.$options.NEXT_PAGE : null;
180180
},
181181
errorTrackingHelpUrl() {
182+
// eslint-disable-next-line local-rules/require-valid-help-page-path
182183
return helpPagePath('operations/error_tracking.html#integrated-error-tracking');
183184
},
184185
showIntegratedDisabledAlert() {

app/assets/javascripts/groups/components/group_item.vue

+1
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ export default {
134134
popoverBody: __('Project visibility level is less restrictive than the group settings.'),
135135
learnMore: __('Learn more'),
136136
},
137+
// eslint-disable-next-line local-rules/require-valid-help-page-path
137138
shareProjectsWithGroupsHelpPagePath: helpPagePath(
138139
'user/project/members/share_project_with_groups',
139140
{
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
<script>
2+
import { GlAlert, GlSprintf } from '@gitlab/ui';
3+
4+
import { s__ } from '~/locale';
5+
import ResetApplicationSettingsModal from './reset_application_settings_modal.vue';
6+
7+
export const I18N_WEB_IDE_OAUTH_APPLICATION_CALLOUT = {
8+
alertTitle: s__(
9+
'IDE|Editing this application might affect the functionality of the Web IDE. Ensure the configuration meets the following conditions:',
10+
),
11+
alertButtonText: s__('IDE|Restore to default'),
12+
configurations: [
13+
s__(
14+
'IDE|The redirect URI path is %{codeBlockStart}%{pathFormat}%{codeBlockEnd}. An example of a valid redirect URI is %{codeBlockStart}%{example}%{codeBlockEnd}.',
15+
),
16+
s__('IDE|The %{boldStart}Trusted%{boldEnd} checkbox is selected.'),
17+
s__('IDE|The %{boldStart}Confidential%{boldEnd} checkbox is cleared.'),
18+
s__('IDE|The %{boldStart}api%{boldEnd} scope is selected.'),
19+
],
20+
};
21+
22+
export default {
23+
name: 'WebIdeOAuthApplicationCallout',
24+
components: {
25+
GlAlert,
26+
GlSprintf,
27+
ResetApplicationSettingsModal,
28+
},
29+
props: {
30+
redirectUrlPath: {
31+
type: String,
32+
required: true,
33+
},
34+
resetApplicationSettingsPath: {
35+
type: String,
36+
required: true,
37+
},
38+
},
39+
data() {
40+
return {
41+
isModalVisible: false,
42+
};
43+
},
44+
methods: {
45+
displayModal() {
46+
this.isModalVisible = true;
47+
},
48+
hideModal() {
49+
this.isModalVisible = false;
50+
},
51+
getRedirectUrl() {
52+
return new URL(this.redirectUrlPath, window.location.origin);
53+
},
54+
},
55+
i18n: I18N_WEB_IDE_OAUTH_APPLICATION_CALLOUT,
56+
};
57+
</script>
58+
<template>
59+
<div>
60+
<reset-application-settings-modal
61+
:visible="isModalVisible"
62+
:reset-application-settings-path="resetApplicationSettingsPath"
63+
@cancel="hideModal"
64+
@close="hideModal"
65+
/>
66+
<gl-alert
67+
variant="info"
68+
class="gl-my-5"
69+
:dismissible="false"
70+
:primary-button-text="$options.i18n.alertButtonText"
71+
@primaryAction="displayModal"
72+
>
73+
<p>{{ $options.i18n.alertTitle }}</p>
74+
<ul class="gl-m-0">
75+
<li v-for="(message, index) in $options.i18n.configurations" :key="index">
76+
<gl-sprintf :message="message">
77+
<template #bold="{ content }">
78+
<strong>{{ content }}</strong>
79+
</template>
80+
<template #codeBlock="{ content }">
81+
<code>{{
82+
sprintf(content, {
83+
pathFormat: redirectUrlPath,
84+
example: `${getRedirectUrl()}`,
85+
})
86+
}}</code>
87+
</template>
88+
</gl-sprintf>
89+
</li>
90+
</ul>
91+
</gl-alert>
92+
</div>
93+
</template>

0 commit comments

Comments
 (0)