Skip to content

Commit 9ccd95d

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

File tree

108 files changed

+841
-396
lines changed

Some content is hidden

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

108 files changed

+841
-396
lines changed

‎app/assets/javascripts/merge_request_tabs.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ function mountPipelines() {
104104
manualActionsLimit: 50,
105105
mergeRequestId: mrWidgetData ? mrWidgetData.iid : null,
106106
sourceProjectFullPath: mrWidgetData?.source_project_full_path || '',
107-
useFailedJobsWidget: gon.features?.ciJobFailuresInMr || false,
107+
useFailedJobsWidget: true,
108108
},
109109
render(createElement) {
110110
return createElement('merge-request-pipelines-table', {

‎app/assets/javascripts/ml/model_registry/components/delete_model_disclosure_dropdown_item.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export default {
7575
variant="danger"
7676
>
7777
<template #list-item>
78-
<span class="gl-text-red-500">
78+
<span class="gl-text-danger">
7979
{{ $options.i18n.actionPrimaryText }}
8080
</span>
8181

‎app/assets/javascripts/ml/model_registry/components/delete_model_version_disclosure_dropdown_item.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export default {
6161
variant="danger"
6262
>
6363
<template #list-item>
64-
<span class="gl-text-red-500" data-testid="menu-item-text">
64+
<span class="gl-text-danger" data-testid="menu-item-text">
6565
{{ $options.modal.actionPrimary.text }}
6666
</span>
6767

‎app/assets/javascripts/ml/model_registry/components/model_create.vue

+28-17
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@ import { __, s__ } from '~/locale';
44
import { visitUrl } from '~/lib/utils/url_utility';
55
import * as Sentry from '~/sentry/sentry_browser_wrapper';
66
import MarkdownEditor from '~/vue_shared/components/markdown/markdown_editor.vue';
7+
import PageHeading from '~/vue_shared/components/page_heading.vue';
78
import { helpPagePath } from '~/helpers/help_page_helper';
89
import { noSpacesRegex } from '~/lib/utils/regexp';
910
import createModelMutation from '../graphql/mutations/create_model.mutation.graphql';
1011
1112
export default {
1213
name: 'ModelCreate',
1314
components: {
15+
PageHeading,
1416
MarkdownEditor,
1517
GlAlert,
1618
GlButton,
@@ -64,6 +66,7 @@ export default {
6466
},
6567
async create() {
6668
this.errorMessage = '';
69+
6770
try {
6871
// Attempt creating a model if needed
6972
if (!this.modelData) {
@@ -120,7 +123,17 @@ export default {
120123
121124
<template>
122125
<div>
123-
<h2>{{ $options.i18n.title }}</h2>
126+
<gl-alert
127+
v-if="errorMessage"
128+
class="gl-mt-5"
129+
data-testid="create-alert"
130+
variant="danger"
131+
@dismiss="hideAlert"
132+
>{{ errorMessage }}
133+
</gl-alert>
134+
135+
<page-heading :heading="$options.i18n.title" />
136+
124137
<gl-form>
125138
<gl-form-group
126139
:label="$options.i18n.modelName"
@@ -136,6 +149,7 @@ export default {
136149
v-model="name"
137150
data-testid="nameId"
138151
type="text"
152+
required
139153
:placeholder="$options.i18n.namePlaceholder"
140154
/>
141155
</gl-form-group>
@@ -163,22 +177,19 @@ export default {
163177
@input="setDescription"
164178
/>
165179
</gl-form-group>
166-
</gl-form>
167180
168-
<gl-alert v-if="errorMessage" data-testid="create-alert" variant="danger" @dismiss="hideAlert"
169-
>{{ errorMessage }}
170-
</gl-alert>
171-
172-
<gl-button data-testid="secondary-button" variant="default" @click="resetForm"
173-
>{{ $options.i18n.actionSecondaryText }}
174-
</gl-button>
175-
176-
<gl-button
177-
data-testid="primary-button"
178-
variant="confirm"
179-
:disabled="submitButtonDisabled"
180-
@click="create"
181-
>{{ $options.i18n.actionPrimaryText }}
182-
</gl-button>
181+
<div class="gl-flex gl-gap-3">
182+
<gl-button
183+
data-testid="primary-button"
184+
variant="confirm"
185+
:disabled="submitButtonDisabled"
186+
@click="create"
187+
>{{ $options.i18n.actionPrimaryText }}
188+
</gl-button>
189+
<gl-button data-testid="secondary-button" variant="default" @click="resetForm"
190+
>{{ $options.i18n.actionSecondaryText }}
191+
</gl-button>
192+
</div>
193+
</gl-form>
183194
</div>
184195
</template>

‎app/assets/javascripts/ml/model_registry/components/model_edit.vue

+24-10
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { __, s__ } from '~/locale';
44
import { visitUrl } from '~/lib/utils/url_utility';
55
import * as Sentry from '~/sentry/sentry_browser_wrapper';
66
import MarkdownEditor from '~/vue_shared/components/markdown/markdown_editor.vue';
7+
import PageHeading from '~/vue_shared/components/page_heading.vue';
78
import { helpPagePath } from '~/helpers/help_page_helper';
89
import { noSpacesRegex } from '~/lib/utils/regexp';
910
import { getIdFromGraphQLId } from '~/graphql_shared/utils';
@@ -12,6 +13,7 @@ import editModelMutation from '../graphql/mutations/edit_model.mutation.graphql'
1213
export default {
1314
name: 'ModelEdit',
1415
components: {
16+
PageHeading,
1517
MarkdownEditor,
1618
GlAlert,
1719
GlButton,
@@ -65,6 +67,7 @@ export default {
6567
methods: {
6668
async edit() {
6769
this.errorMessage = '';
70+
6871
try {
6972
const { data } = await this.$apollo.mutate({
7073
mutation: editModelMutation,
@@ -118,7 +121,17 @@ export default {
118121
119122
<template>
120123
<div>
121-
<h2>{{ $options.i18n.title }}</h2>
124+
<gl-alert
125+
v-if="errorMessage"
126+
data-testid="edit-alert"
127+
variant="danger"
128+
class="gl-mt-5"
129+
@dismiss="hideAlert"
130+
>{{ errorMessage }}
131+
</gl-alert>
132+
133+
<page-heading :heading="$options.i18n.title" />
134+
122135
<gl-form>
123136
<gl-form-group
124137
:label="$options.i18n.modelName"
@@ -134,6 +147,7 @@ export default {
134147
:value="model.name"
135148
data-testid="nameId"
136149
type="text"
150+
required
137151
:disabled="true"
138152
/>
139153
</gl-form-group>
@@ -161,15 +175,15 @@ export default {
161175
@input="setDescription"
162176
/>
163177
</gl-form-group>
178+
179+
<div class="gl-flex gl-gap-3">
180+
<gl-button data-testid="primary-button" variant="confirm" @click="edit"
181+
>{{ $options.i18n.actionPrimaryText }}
182+
</gl-button>
183+
<gl-button data-testid="secondary-button" variant="default" :href="modelPath"
184+
>{{ $options.i18n.actionSecondaryText }}
185+
</gl-button>
186+
</div>
164187
</gl-form>
165-
<gl-alert v-if="errorMessage" data-testid="edit-alert" variant="danger" @dismiss="hideAlert"
166-
>{{ errorMessage }}
167-
</gl-alert>
168-
<gl-button data-testid="secondary-button" variant="default" :href="modelPath"
169-
>{{ $options.i18n.actionSecondaryText }}
170-
</gl-button>
171-
<gl-button data-testid="primary-button" variant="confirm" @click="edit"
172-
>{{ $options.i18n.actionPrimaryText }}
173-
</gl-button>
174188
</div>
175189
</template>

‎app/assets/javascripts/ml/model_registry/components/model_version_create.vue

+33-16
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@ import { __, s__, sprintf } from '~/locale';
44
import { visitUrlWithAlerts } from '~/lib/utils/url_utility';
55
import * as Sentry from '~/sentry/sentry_browser_wrapper';
66
import { semverRegex } from '~/lib/utils/regexp';
7+
import PageHeading from '~/vue_shared/components/page_heading.vue';
78
import MarkdownEditor from '~/vue_shared/components/markdown/markdown_editor.vue';
89
import { helpPagePath } from '~/helpers/help_page_helper';
910
import createModelVersionMutation from '../graphql/mutations/create_model_version.mutation.graphql';
1011
1112
export default {
1213
name: 'ModelVersionCreate',
1314
components: {
15+
PageHeading,
1416
GlAlert,
1517
GlButton,
1618
GlForm,
@@ -109,6 +111,7 @@ export default {
109111
},
110112
async create() {
111113
this.errorMessage = '';
114+
112115
try {
113116
if (!this.versionData) {
114117
this.versionData = await this.createModelVersion();
@@ -176,9 +179,22 @@ export default {
176179
177180
<template>
178181
<div>
182+
<gl-alert
183+
v-if="errorMessage"
184+
class="gl-mt-5"
185+
data-testid="create-alert"
186+
variant="danger"
187+
@dismiss="hideAlert"
188+
>{{ errorMessage }}
189+
</gl-alert>
190+
191+
<page-heading :heading="$options.i18n.title">
192+
<template #description>
193+
{{ $options.i18n.description }}
194+
</template>
195+
</page-heading>
196+
179197
<gl-form>
180-
<h2 data-testid="title">{{ $options.i18n.title }}</h2>
181-
<p data-testid="description" class="gl-text-default">{{ $options.i18n.description }}</p>
182198
<gl-form-group
183199
data-testid="versionDescriptionId"
184200
:label="$options.i18n.versionLabelText"
@@ -193,6 +209,7 @@ export default {
193209
v-model="version"
194210
data-testid="versionId"
195211
type="text"
212+
required
196213
:placeholder="$options.i18n.versionPlaceholder"
197214
autocomplete="off"
198215
/>
@@ -229,24 +246,24 @@ export default {
229246
<import-artifact-zone
230247
id="versionImportArtifactZone"
231248
ref="importArtifactZoneRef"
232-
class="gl-px-3 gl-py-0"
249+
class="gl-px-0 gl-py-0"
233250
:submit-on-select="false"
234251
@error="onImportError"
235252
/>
236253
</gl-form-group>
254+
255+
<div class="gl-flex gl-gap-3">
256+
<gl-button
257+
data-testid="primary-button"
258+
variant="confirm"
259+
:disabled="submitButtonDisabled"
260+
@click="create"
261+
>{{ $options.i18n.actionPrimaryText }}
262+
</gl-button>
263+
<gl-button data-testid="secondary-button" variant="default" @click="resetForm"
264+
>{{ $options.i18n.actionSecondaryText }}
265+
</gl-button>
266+
</div>
237267
</gl-form>
238-
<gl-alert v-if="errorMessage" variant="danger" @dismiss="hideAlert">{{
239-
errorMessage
240-
}}</gl-alert>
241-
<gl-button
242-
data-testid="primary-button"
243-
variant="confirm"
244-
:disabled="submitButtonDisabled"
245-
@click="create"
246-
>{{ $options.i18n.actionPrimaryText }}
247-
</gl-button>
248-
<gl-button data-testid="secondary-button" variant="default" @click="resetForm"
249-
>{{ $options.i18n.actionSecondaryText }}
250-
</gl-button>
251268
</div>
252269
</template>

‎app/assets/javascripts/ml/model_registry/components/model_version_edit.vue

+22-10
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { GlAlert, GlButton, GlForm, GlFormGroup } from '@gitlab/ui';
33
import { __, s__ } from '~/locale';
44
import { visitUrl } from '~/lib/utils/url_utility';
55
import * as Sentry from '~/sentry/sentry_browser_wrapper';
6+
import PageHeading from '~/vue_shared/components/page_heading.vue';
67
import MarkdownEditor from '~/vue_shared/components/markdown/markdown_editor.vue';
78
import { helpPagePath } from '~/helpers/help_page_helper';
89
import editModelVersionMutation from '../graphql/mutations/edit_model_version.mutation.graphql';
@@ -11,6 +12,7 @@ import { emptyArtifactFile } from '../constants';
1112
export default {
1213
name: 'ModelVersionEdit',
1314
components: {
15+
PageHeading,
1416
MarkdownEditor,
1517
GlAlert,
1618
GlButton,
@@ -104,7 +106,17 @@ export default {
104106
105107
<template>
106108
<div>
107-
<h2>{{ $options.i18n.title }}</h2>
109+
<gl-alert
110+
v-if="errorMessage"
111+
data-testid="edit-alert"
112+
variant="danger"
113+
class="gl-mt-5"
114+
@dismiss="hideAlert"
115+
>{{ errorMessage }}
116+
</gl-alert>
117+
118+
<page-heading :heading="$options.i18n.title" />
119+
108120
<gl-form>
109121
<gl-form-group
110122
:label="$options.i18n.descriptionLabel"
@@ -129,16 +141,16 @@ export default {
129141
:restricted-tool-bar-items="markdownEditorRestrictedToolBarItems"
130142
@input="setDescription"
131143
/>
144+
145+
<div class="gl-mt-5 gl-flex gl-gap-3">
146+
<gl-button data-testid="primary-button" variant="confirm" @click="edit"
147+
>{{ $options.i18n.actionPrimaryText }}
148+
</gl-button>
149+
<gl-button data-testid="secondary-button" variant="default" :href="modelVersionPath"
150+
>{{ $options.i18n.actionSecondaryText }}
151+
</gl-button>
152+
</div>
132153
</gl-form-group>
133154
</gl-form>
134-
<gl-alert v-if="errorMessage" data-testid="edit-alert" variant="danger" @dismiss="hideAlert"
135-
>{{ errorMessage }}
136-
</gl-alert>
137-
<gl-button data-testid="secondary-button" variant="default" :href="modelVersionPath"
138-
>{{ $options.i18n.actionSecondaryText }}
139-
</gl-button>
140-
<gl-button data-testid="primary-button" variant="confirm" @click="edit"
141-
>{{ $options.i18n.actionPrimaryText }}
142-
</gl-button>
143155
</div>
144156
</template>

‎app/assets/javascripts/pages/groups/edit/index.js

-15
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,12 @@ import initTransferGroupForm from '~/groups/init_transfer_group_form';
55
import { initGroupSelects } from '~/vue_shared/components/entity_select/init_group_selects';
66
import { initProjectSelects } from '~/vue_shared/components/entity_select/init_project_selects';
77
import { initCascadingSettingsLockTooltips } from '~/namespaces/cascading_settings';
8-
import { initDormantUsersInputSection } from '~/pages/admin/application_settings/account_and_limits';
98
import mountBadgeSettings from '~/pages/shared/mount_badge_settings';
109
import initSearchSettings from '~/search_settings';
1110
import initSettingsPanels from '~/settings_panels';
1211
import initConfirmDanger from '~/init_confirm_danger';
1312
import { initGroupSettingsReadme } from '~/groups/settings/init_group_settings_readme';
1413

15-
/**
16-
* Sets up logic inside "Dormant members" subsection:
17-
* - checkbox enables/disables additional input
18-
* - shows/hides an inline error on input validation
19-
*/
20-
function initDeactivateDormantMembersPeriodInputSection() {
21-
initDormantUsersInputSection(
22-
'group_remove_dormant_members',
23-
'group_remove_dormant_members_period',
24-
'group_remove_dormant_members_period_error',
25-
);
26-
}
27-
28-
initDeactivateDormantMembersPeriodInputSection();
2914
initFilePickers();
3015
initConfirmDanger();
3116
initSettingsPanels();

‎app/controllers/concerns/groups/params.rb

-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ def group_params_attributes
4747
] },
4848
:default_branch_name,
4949
:allow_mfa_for_subgroups,
50-
:remove_dormant_members,
51-
:remove_dormant_members_period,
5250
:resource_access_token_creation_allowed,
5351
:resource_access_token_notify_inherited,
5452
:lock_resource_access_token_notify_inherited,

‎app/controllers/concerns/wiki_actions.rb

-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ module WikiActions
4949
end
5050
end
5151

52-
track_event :show, name: 'wiki_action'
5352
track_internal_event :show, name: 'view_wiki_page'
5453

5554
helper_method :view_file_button, :diff_file_html_data

0 commit comments

Comments
 (0)