diff options
Diffstat (limited to 'app/assets/javascripts/projects')
11 files changed, 232 insertions, 141 deletions
diff --git a/app/assets/javascripts/projects/clusters_deprecation_alert/components/clusters_deprecation_alert.vue b/app/assets/javascripts/projects/clusters_deprecation_alert/components/clusters_deprecation_alert.vue index e026b3e1060..750eb5836e1 100644 --- a/app/assets/javascripts/projects/clusters_deprecation_alert/components/clusters_deprecation_alert.vue +++ b/app/assets/javascripts/projects/clusters_deprecation_alert/components/clusters_deprecation_alert.vue @@ -10,6 +10,7 @@ export default { }, inject: ['message'], docsLink: helpPagePath('user/infrastructure/clusters/migrate_to_gitlab_agent.md'), + deprecationEpic: 'https://gitlab.com/groups/gitlab-org/configure/-/epics/8', }; </script> <template> @@ -18,6 +19,9 @@ export default { <template #link="{ content }"> <gl-link :href="$options.docsLink">{{ content }}</gl-link> </template> + <template #deprecationLink="{ content }"> + <gl-link :href="$options.deprecationEpic">{{ content }}</gl-link> + </template> </gl-sprintf> </gl-alert> </template> diff --git a/app/assets/javascripts/projects/commits/components/author_select.vue b/app/assets/javascripts/projects/commits/components/author_select.vue index 2966214e051..cf251bc7465 100644 --- a/app/assets/javascripts/projects/commits/components/author_select.vue +++ b/app/assets/javascripts/projects/commits/components/author_select.vue @@ -1,27 +1,18 @@ <script> -import { - GlDropdown, - GlDropdownSectionHeader, - GlDropdownItem, - GlSearchBoxByType, - GlDropdownDivider, - GlTooltipDirective, -} from '@gitlab/ui'; +import { GlAvatar, GlCollapsibleListbox, GlTooltipDirective } from '@gitlab/ui'; import { debounce } from 'lodash'; -import { mapState, mapActions } from 'vuex'; -import { redirectTo, queryToObject } from '~/lib/utils/url_utility'; // eslint-disable-line import/no-deprecated -import { __ } from '~/locale'; +import { mapActions, mapState } from 'vuex'; +import { queryToObject, visitUrl } from '~/lib/utils/url_utility'; +import { n__, __ } from '~/locale'; +import { DEFAULT_DEBOUNCE_AND_THROTTLE_MS } from '~/lib/utils/constants'; const tooltipMessage = __('Searching by both author and message is currently not supported.'); export default { name: 'AuthorSelect', components: { - GlDropdown, - GlDropdownSectionHeader, - GlDropdownItem, - GlSearchBoxByType, - GlDropdownDivider, + GlAvatar, + GlCollapsibleListbox, }, directives: { GlTooltip: GlTooltipDirective, @@ -35,9 +26,9 @@ export default { data() { return { hasSearchParam: false, - searchTerm: '', - authorInput: '', currentAuthor: '', + searchTerm: '', + searching: false, }; }, computed: { @@ -45,9 +36,33 @@ export default { dropdownText() { return this.currentAuthor || __('Author'); }, + dropdownItems() { + const commitAuthorOptions = this.commitsAuthors.map((author) => ({ + value: author.name, + text: author.name, + secondaryText: author.username, + avatarUrl: author.avatar_url, + })); + if (this.searchTerm) return commitAuthorOptions; + + const defaultOptions = { + text: '', + options: [{ text: __('Any Author'), value: '' }], + textSrOnly: true, + }; + const authorOptionsGroup = { + text: 'authors', + options: commitAuthorOptions, + textSrOnly: true, + }; + return [defaultOptions, authorOptionsGroup]; + }, tooltipTitle() { return this.hasSearchParam && tooltipMessage; }, + searchSummarySrText() { + return n__('%d author', '%d authors', this.commitsAuthors.length); + }, }, mounted() { this.fetchAuthors(); @@ -73,9 +88,7 @@ export default { }, methods: { ...mapActions(['fetchAuthors']), - selectAuthor(author) { - const { name: user } = author || {}; - + selectAuthor(user) { // Follow up issue "Remove usage of $.fadeIn from the codebase" // > https://gitlab.com/gitlab-org/gitlab/-/issues/214395 @@ -89,13 +102,19 @@ export default { commitListElement.style.transition = 'opacity 200ms'; if (!user) { - return redirectTo(this.commitsPath); // eslint-disable-line import/no-deprecated + return visitUrl(this.commitsPath); } - return redirectTo(`${this.commitsPath}?author=${user}`); // eslint-disable-line import/no-deprecated + return visitUrl(`${this.commitsPath}?author=${user}`); }, - searchAuthors() { - this.fetchAuthors(this.authorInput); + searchAuthors: debounce(async function debouncedSearch() { + this.searching = true; + await this.fetchAuthors(this.searchTerm); + this.searching = false; + }, DEFAULT_DEBOUNCE_AND_THROTTLE_MS), + handleSearch(input) { + this.searchTerm = input; + this.searchAuthors(); }, setSearchParam(value) { this.hasSearchParam = Boolean(value); @@ -105,36 +124,45 @@ export default { </script> <template> - <div ref="dropdownContainer" v-gl-tooltip :title="tooltipTitle" :disabled="!hasSearchParam"> - <gl-dropdown - :text="dropdownText" + <div ref="listboxContainer" v-gl-tooltip :title="tooltipTitle" :disabled="!hasSearchParam"> + <gl-collapsible-listbox + v-model="currentAuthor" + block + is-check-centered + searchable + class="gl-mt-3 gl-sm-mt-0" + :items="dropdownItems" + :header-text="__('Search by author')" + :toggle-text="dropdownText" + :search-placeholder="__('Search')" + :searching="searching" :disabled="hasSearchParam" - toggle-class="gl-py-3 gl-border-0" - class="w-100 gl-mt-3 mt-sm-0" + @search="handleSearch" + @select="selectAuthor" > - <gl-dropdown-section-header> - {{ __('Search by author') }} - </gl-dropdown-section-header> - <gl-dropdown-divider /> - <gl-search-box-by-type - v-model.trim="authorInput" - :placeholder="__('Search')" - @input="searchAuthors" - /> - <gl-dropdown-item :is-checked="!currentAuthor" @click="selectAuthor(null)"> - {{ __('Any Author') }} - </gl-dropdown-item> - <gl-dropdown-divider /> - <gl-dropdown-item - v-for="author in commitsAuthors" - :key="author.id" - :is-checked="author.name === currentAuthor" - :avatar-url="author.avatar_url" - :secondary-text="author.username" - @click="selectAuthor(author)" - > - {{ author.name }} - </gl-dropdown-item> - </gl-dropdown> + <template #search-summary-sr-only> + {{ searchSummarySrText }} + </template> + <template #list-item="{ item }"> + <span class="gl-display-flex gl-align-items-center"> + <gl-avatar + v-if="item.avatarUrl" + class="gl-mr-3" + :size="32" + :entity-name="item.text" + :src="item.avatarUrl" + :alt="item.text" + /> + <span + class="gl-display-flex gl-flex-direction-column gl-overflow-hidden gl-overflow-break-word" + > + {{ item.text }} + <span v-if="item.secondaryText" class="gl-text-secondary"> + {{ item.secondaryText }} + </span> + </span> + </span> + </template> + </gl-collapsible-listbox> </div> </template> diff --git a/app/assets/javascripts/projects/compare/components/app.vue b/app/assets/javascripts/projects/compare/components/app.vue index e4d5e5bd233..b40b28adab9 100644 --- a/app/assets/javascripts/projects/compare/components/app.vue +++ b/app/assets/javascripts/projects/compare/components/app.vue @@ -1,7 +1,21 @@ <script> -import { GlDropdown, GlDropdownItem, GlButton } from '@gitlab/ui'; +import { + GlButton, + GlFormGroup, + GlFormRadioGroup, + GlIcon, + GlTooltipDirective, + GlSprintf, + GlLink, +} from '@gitlab/ui'; import csrf from '~/lib/utils/csrf'; import { joinPaths } from '~/lib/utils/url_utility'; +import { + I18N, + COMPARE_OPTIONS, + COMPARE_REVISIONS_DOCS_URL, + COMPARE_OPTIONS_INPUT_NAME, +} from '../constants'; import RevisionCard from './revision_card.vue'; export default { @@ -9,8 +23,14 @@ export default { components: { RevisionCard, GlButton, - GlDropdown, - GlDropdownItem, + GlFormRadioGroup, + GlFormGroup, + GlIcon, + GlLink, + GlSprintf, + }, + directives: { + GlTooltip: GlTooltipDirective, }, props: { projectCompareIndexPath: { @@ -76,24 +96,6 @@ export default { isStraight: this.straight, }; }, - computed: { - straightModeDropdownItems() { - return [ - { - modeType: 'off', - isEnabled: false, - content: '..', - testId: 'disableStraightModeButton', - }, - { - modeType: 'on', - isEnabled: true, - content: '...', - testId: 'enableStraightModeButton', - }, - ]; - }, - }, methods: { onSubmit() { this.$refs.form.submit(); @@ -110,10 +112,11 @@ export default { onSwapRevision() { [this.from, this.to] = [this.to, this.from]; // swaps 'from' and 'to' }, - setStraightMode(isStraight) { - this.isStraight = isStraight; - }, }, + i18n: I18N, + compareOptions: COMPARE_OPTIONS, + docsLink: COMPARE_REVISIONS_DOCS_URL, + inputName: COMPARE_OPTIONS_INPUT_NAME, }; </script> @@ -125,13 +128,26 @@ export default { :action="projectCompareIndexPath" > <input :value="$options.csrf.token" type="hidden" name="authenticity_token" /> + <h1 class="gl-font-size-h1 gl-mt-4">{{ $options.i18n.title }}</h1> + <p> + <gl-sprintf :message="$options.i18n.subtitle"> + <template #bold="{ content }"> + <strong>{{ content }}</strong> + </template> + <template #link="{ content }"> + <gl-link target="_blank" :href="$options.docsLink" data-testid="help-link">{{ + content + }}</gl-link> + </template> + </gl-sprintf> + </p> <div class="gl-lg-flex-direction-row gl-lg-display-flex gl-align-items-center compare-revision-cards" > <revision-card data-testid="sourceRevisionCard" :refs-project-path="to.refsProjectPath" - :revision-text="__('Source')" + :revision-text="$options.i18n.source" params-name="to" :params-branch="to.revision" :projects="to.projects" @@ -139,28 +155,26 @@ export default { @selectProject="onSelectProject" @selectRevision="onSelectRevision" /> - <div - class="gl-display-flex gl-justify-content-center gl-align-items-center gl-align-self-end gl-my-3 gl-md-my-0 gl-pl-3 gl-pr-3" - data-testid="ellipsis" + <gl-button + v-gl-tooltip="$options.i18n.swapRevisions" + class="gl-display-flex gl-mx-3 gl-align-self-end swap-button" + data-testid="swapRevisionsButton" + category="tertiary" + @click="onSwapRevision" > - <input :value="isStraight ? 'true' : 'false'" type="hidden" name="straight" /> - <gl-dropdown data-testid="modeDropdown" :text="isStraight ? '...' : '..'" size="small"> - <gl-dropdown-item - v-for="mode in straightModeDropdownItems" - :key="mode.modeType" - :is-check-item="true" - :is-checked="isStraight == mode.isEnabled" - :data-testid="mode.testId" - @click="setStraightMode(mode.isEnabled)" - > - <span class="dropdown-menu-inner-content"> {{ mode.content }} </span> - </gl-dropdown-item> - </gl-dropdown> - </div> + <gl-icon name="substitute" /> + </gl-button> + <gl-button + v-gl-tooltip="$options.i18n.swapRevisions" + class="gl-display-none gl-align-self-end gl-my-5 swap-button-mobile" + @click="onSwapRevision" + > + {{ $options.i18n.swap }} + </gl-button> <revision-card data-testid="targetRevisionCard" :refs-project-path="from.refsProjectPath" - :revision-text="__('Target')" + :revision-text="$options.i18n.target" params-name="from" :params-branch="from.revision" :projects="from.projects" @@ -169,22 +183,32 @@ export default { @selectRevision="onSelectRevision" /> </div> - <div class="gl-display-flex gl-mt-6 gl-gap-3"> - <gl-button category="primary" variant="confirm" @click="onSubmit"> - {{ s__('CompareRevisions|Compare') }} - </gl-button> - <gl-button data-testid="swapRevisionsButton" @click="onSwapRevision"> - {{ s__('CompareRevisions|Swap revisions') }} + <gl-form-group :label="$options.i18n.optionsLabel" class="gl-mt-4"> + <gl-form-radio-group + v-model="isStraight" + :options="$options.compareOptions" + :name="$options.inputName" + required + /> + </gl-form-group> + <div class="gl-display-flex gl-gap-3 gl-pb-4"> + <gl-button + category="primary" + variant="confirm" + data-testid="compare-button" + @click="onSubmit" + > + {{ $options.i18n.compare }} </gl-button> <gl-button v-if="projectMergeRequestPath" :href="projectMergeRequestPath" data-testid="projectMrButton" > - {{ s__('CompareRevisions|View open merge request') }} + {{ $options.i18n.viewMr }} </gl-button> <gl-button v-else-if="createMrPath" :href="createMrPath" data-testid="createMrButton"> - {{ s__('CompareRevisions|Create merge request') }} + {{ $options.i18n.openMr }} </gl-button> </div> </form> diff --git a/app/assets/javascripts/projects/compare/components/revision_card.vue b/app/assets/javascripts/projects/compare/components/revision_card.vue index 162aca44f9d..212937c87c6 100644 --- a/app/assets/javascripts/projects/compare/components/revision_card.vue +++ b/app/assets/javascripts/projects/compare/components/revision_card.vue @@ -40,7 +40,7 @@ export default { <template> <div class="revision-card gl-flex-basis-half"> - <h2 class="gl-font-size-h2"> + <h2 class="gl-font-base gl-mt-0"> {{ s__(`CompareRevisions|${revisionText}`) }} </h2> <div class="gl-sm-display-flex gl-align-items-center gl-gap-3"> diff --git a/app/assets/javascripts/projects/compare/constants.js b/app/assets/javascripts/projects/compare/constants.js new file mode 100644 index 00000000000..2f07cf57521 --- /dev/null +++ b/app/assets/javascripts/projects/compare/constants.js @@ -0,0 +1,25 @@ +import { __, s__ } from '~/locale'; +import { DOCS_URL_IN_EE_DIR } from 'jh_else_ce/lib/utils/url_utility'; + +export const COMPARE_OPTIONS_INPUT_NAME = 'straight'; +export const COMPARE_OPTIONS = [ + { value: false, text: s__('CompareRevisions|Only incoming changes from source') }, + { value: true, text: s__('CompareRevisions|Include changes to target since source was created') }, +]; + +export const I18N = { + title: s__('CompareRevisions|Compare revisions'), + subtitle: s__( + 'CompareRevisions|Changes are shown as if the %{boldStart}source%{boldEnd} revision was being merged into the %{boldStart}target%{boldEnd} revision. %{linkStart}Learn more about comparing revisions.%{linkEnd}', + ), + source: __('Source'), + swap: s__('CompareRevisions|Swap'), + target: __('Target'), + swapRevisions: s__('CompareRevisions|Swap revisions'), + compare: s__('CompareRevisions|Compare'), + optionsLabel: s__('CompareRevisions|Show changes'), + viewMr: s__('CompareRevisions|View open merge request'), + openMr: s__('CompareRevisions|Create merge request'), +}; + +export const COMPARE_REVISIONS_DOCS_URL = `${DOCS_URL_IN_EE_DIR}/user/project/repository/branches/#compare-branches`; diff --git a/app/assets/javascripts/projects/new/components/app.vue b/app/assets/javascripts/projects/new/components/app.vue index 6ca83b0b500..a841766a93c 100644 --- a/app/assets/javascripts/projects/new/components/app.vue +++ b/app/assets/javascripts/projects/new/components/app.vue @@ -1,8 +1,8 @@ <script> -import createFromTemplateIllustration from '@gitlab/svgs/dist/illustrations/project-create-from-template-sm.svg?raw'; -import blankProjectIllustration from '@gitlab/svgs/dist/illustrations/project-create-new-sm.svg?raw'; -import importProjectIllustration from '@gitlab/svgs/dist/illustrations/project-import-sm.svg?raw'; -import ciCdProjectIllustration from '@gitlab/svgs/dist/illustrations/project-run-CICD-pipelines-sm.svg?raw'; +import PROJECT_CREATE_FROM_TEMPLATE_SVG_URL from '@gitlab/svgs/dist/illustrations/project-create-from-template-sm.svg?url'; +import PROJECT_CREATE_NEW_SVG_URL from '@gitlab/svgs/dist/illustrations/project-create-new-sm.svg?url'; +import PROJECT_IMPORT_SVG_URL from '@gitlab/svgs/dist/illustrations/project-import-sm.svg?url'; +import PROJECT_RUN_CICD_PIPELINES_SVG_URL from '@gitlab/svgs/dist/illustrations/project-run-CICD-pipelines-sm.svg?url'; import SafeHtml from '~/vue_shared/directives/safe_html'; import { s__ } from '~/locale'; import NewNamespacePage from '~/vue_shared/new_namespace/new_namespace_page.vue'; @@ -19,7 +19,7 @@ const PANELS = [ description: s__( 'ProjectsNew|Create a blank project to store your files, plan your work, and collaborate on code, among other things.', ), - illustration: blankProjectIllustration, + imageSrc: PROJECT_CREATE_NEW_SVG_URL, }, { key: 'template', @@ -29,7 +29,7 @@ const PANELS = [ description: s__( 'ProjectsNew|Create a project pre-populated with the necessary files to get you started quickly.', ), - illustration: createFromTemplateIllustration, + imageSrc: PROJECT_CREATE_FROM_TEMPLATE_SVG_URL, }, { key: 'import', @@ -39,7 +39,7 @@ const PANELS = [ description: s__( 'ProjectsNew|Migrate your data from an external source like GitHub, Bitbucket, or another instance of GitLab.', ), - illustration: importProjectIllustration, + imageSrc: PROJECT_IMPORT_SVG_URL, }, { key: 'ci', @@ -47,7 +47,7 @@ const PANELS = [ selector: '#ci-cd-project-pane', title: s__('ProjectsNew|Run CI/CD for external repository'), description: s__('ProjectsNew|Connect your external repository to GitLab CI/CD.'), - illustration: ciCdProjectIllustration, + imageSrc: PROJECT_RUN_CICD_PIPELINES_SVG_URL, }, ]; diff --git a/app/assets/javascripts/projects/settings/access_dropdown.js b/app/assets/javascripts/projects/settings/access_dropdown.js index d8675a851ea..75d72f719e5 100644 --- a/app/assets/javascripts/projects/settings/access_dropdown.js +++ b/app/assets/javascripts/projects/settings/access_dropdown.js @@ -3,6 +3,7 @@ import { escape, find, countBy } from 'lodash'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; import { createAlert } from '~/alert'; import { n__, s__, __, sprintf } from '~/locale'; +import { renderAvatar } from '~/helpers/avatar_helper'; import { getUsers, getGroups, getDeployKeys } from './api/access_dropdown_api'; import { LEVEL_TYPES, LEVEL_ID_PROP, ACCESS_LEVELS, ACCESS_LEVEL_NONE } from './constants'; @@ -534,13 +535,22 @@ export default class AccessDropdown { userRowHtml(user, isActive) { const isActiveClass = isActive || ''; + const avatarEl = renderAvatar(user, { + sizeClass: 's32', + }); return ` <li> <a href="#" class="${isActiveClass}"> - <img src="${user.avatar_url}" class="avatar avatar-inline" width="30"> - <strong class="dropdown-menu-user-full-name">${escape(user.name)}</strong> - <span class="dropdown-menu-user-username">${user.username}</span> + <div class="gl-avatar-labeled"> + ${avatarEl} + <div> + <strong class="dropdown-menu-user-full-name">${escape(user.name)}</strong> + <span class="gl-avatar-labeled-sublabel dropdown-menu-user-username">@${ + user.username + }</span> + </div> + </div> </a> </li> `; diff --git a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue index 650b60cba4f..ae28694f5d2 100644 --- a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue +++ b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue @@ -7,8 +7,8 @@ import { __, sprintf } from '~/locale'; import ServiceDeskSetting from './service_desk_setting.vue'; export default { - customEmailHelpPath: helpPagePath('/user/project/service_desk.html', { - anchor: 'use-a-custom-email-address', + serviceDeskEmailHelpPath: helpPagePath('/user/project/service_desk.html', { + anchor: 'use-an-additional-service-desk-alias-email', }), components: { GlAlert, @@ -32,10 +32,10 @@ export default { initialIncomingEmail: { default: '', }, - customEmail: { + serviceDeskEmail: { default: '', }, - customEmailEnabled: { + serviceDeskEmailEnabled: { default: false, }, selectedTemplate: { @@ -65,7 +65,7 @@ export default { alertVariant: 'danger', alertMessage: '', incomingEmail: this.initialIncomingEmail, - updatedCustomEmail: this.customEmail, + updatedServiceDeskEmail: this.serviceDeskEmail, }; }, methods: { @@ -110,7 +110,7 @@ export default { return axios .put(this.endpoint, body) .then(({ data }) => { - this.updatedCustomEmail = data?.service_desk_address; + this.updatedServiceDeskEmail = data?.service_desk_address; this.showAlert(__('Changes saved.'), 'success'); }) .catch((err) => { @@ -155,7 +155,7 @@ export default { " > <template #link="{ content }"> - <gl-link :href="$options.customEmailHelpPath" target="_blank"> + <gl-link :href="$options.serviceDeskEmailHelpPath" target="_blank"> {{ content }} </gl-link> </template> @@ -168,8 +168,8 @@ export default { :is-enabled="isEnabled" :is-issue-tracker-enabled="isIssueTrackerEnabled" :incoming-email="incomingEmail" - :custom-email="updatedCustomEmail" - :custom-email-enabled="customEmailEnabled" + :service-desk-email="updatedServiceDeskEmail" + :service-desk-email-enabled="serviceDeskEmailEnabled" :initial-selected-template="selectedTemplate" :initial-selected-file-template-project-id="selectedFileTemplateProjectId" :initial-outgoing-name="outgoingName" diff --git a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue index 38a2c12d137..5078cbbdf59 100644 --- a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue +++ b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue @@ -49,12 +49,12 @@ export default { required: false, default: '', }, - customEmail: { + serviceDeskEmail: { type: String, required: false, default: '', }, - customEmailEnabled: { + serviceDeskEmailEnabled: { type: Boolean, required: false, }, @@ -101,22 +101,22 @@ export default { }, computed: { hasProjectKeySupport() { - return Boolean(this.customEmailEnabled); + return Boolean(this.serviceDeskEmailEnabled); }, email() { - return this.customEmail || this.incomingEmail; + return this.serviceDeskEmail || this.incomingEmail; }, - hasCustomEmail() { - return this.customEmail && this.customEmail !== this.incomingEmail; + hasServiceDeskEmail() { + return this.serviceDeskEmail && this.serviceDeskEmail !== this.incomingEmail; }, emailSuffixHelpUrl() { return helpPagePath('user/project/service_desk.html', { - anchor: 'configure-a-custom-email-address-suffix', + anchor: 'configure-a-suffix-for-service-desk-alias-email', }); }, - customEmailAddressHelpUrl() { + serviceDeskEmailAddressHelpUrl() { return helpPagePath('user/project/service_desk.html', { - anchor: 'use-a-custom-email-address', + anchor: 'use-an-additional-service-desk-alias-email', }); }, issuesHelpPagePath() { @@ -204,7 +204,7 @@ export default { <clipboard-button :title="__('Copy')" :text="email" css-class="input-group-text" /> </template> </gl-form-input-group> - <template v-if="email && hasCustomEmail" #description> + <template v-if="email && hasServiceDeskEmail" #description> <span class="gl-mt-2 gl-display-inline-block"> <gl-sprintf :message="__('Emails sent to %{email} are also supported.')"> <template #email> @@ -260,7 +260,7 @@ export default { > <template #link="{ content }"> <gl-link - :href="customEmailAddressHelpUrl" + :href="serviceDeskEmailAddressHelpUrl" target="_blank" class="gl-text-blue-600 font-size-inherit" >{{ content }} diff --git a/app/assets/javascripts/projects/settings_service_desk/index.js b/app/assets/javascripts/projects/settings_service_desk/index.js index 84229175c0b..0f4c747a7b6 100644 --- a/app/assets/javascripts/projects/settings_service_desk/index.js +++ b/app/assets/javascripts/projects/settings_service_desk/index.js @@ -10,8 +10,8 @@ export default () => { } const { - customEmail, - customEmailEnabled, + serviceDeskEmail, + serviceDeskEmailEnabled, enabled, issueTrackerEnabled, endpoint, @@ -27,8 +27,8 @@ export default () => { return new Vue({ el, provide: { - customEmail, - customEmailEnabled: parseBoolean(customEmailEnabled), + serviceDeskEmail, + serviceDeskEmailEnabled: parseBoolean(serviceDeskEmailEnabled), endpoint, initialIncomingEmail: incomingEmail, initialIsEnabled: parseBoolean(enabled), diff --git a/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue b/app/assets/javascripts/projects/tree/components/commit_pipeline_status.vue index 5b620aa2300..5b620aa2300 100644 --- a/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue +++ b/app/assets/javascripts/projects/tree/components/commit_pipeline_status.vue |