diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /app/assets/javascripts/projects | |
parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'app/assets/javascripts/projects')
9 files changed, 47 insertions, 34 deletions
diff --git a/app/assets/javascripts/projects/commits/components/author_select.vue b/app/assets/javascripts/projects/commits/components/author_select.vue index a8589b50899..2204ec3cbe7 100644 --- a/app/assets/javascripts/projects/commits/components/author_select.vue +++ b/app/assets/javascripts/projects/commits/components/author_select.vue @@ -2,11 +2,11 @@ import { debounce } from 'lodash'; import { mapState, mapActions } from 'vuex'; import { - GlNewDropdown, - GlNewDropdownHeader, - GlNewDropdownItem, + GlDropdown, + GlDropdownSectionHeader, + GlDropdownItem, GlSearchBoxByType, - GlNewDropdownDivider, + GlDropdownDivider, GlTooltipDirective, } from '@gitlab/ui'; import { redirectTo } from '~/lib/utils/url_utility'; @@ -18,11 +18,11 @@ const tooltipMessage = __('Searching by both author and message is currently not export default { name: 'AuthorSelect', components: { - GlNewDropdown, - GlNewDropdownHeader, - GlNewDropdownItem, + GlDropdown, + GlDropdownSectionHeader, + GlDropdownItem, GlSearchBoxByType, - GlNewDropdownDivider, + GlDropdownDivider, }, directives: { GlTooltip: GlTooltipDirective, @@ -107,27 +107,27 @@ export default { <template> <div ref="dropdownContainer" v-gl-tooltip :title="tooltipTitle" :disabled="!hasSearchParam"> - <gl-new-dropdown + <gl-dropdown :text="dropdownText" :disabled="hasSearchParam" toggle-class="gl-py-3 gl-border-0" class="w-100 mt-2 mt-sm-0" > - <gl-new-dropdown-header> + <gl-dropdown-section-header> {{ __('Search by author') }} - </gl-new-dropdown-header> - <gl-new-dropdown-divider /> + </gl-dropdown-section-header> + <gl-dropdown-divider /> <gl-search-box-by-type v-model.trim="authorInput" - class="m-2" + class="gl-m-3" :placeholder="__('Search')" @input="searchAuthors" /> - <gl-new-dropdown-item :is-checked="!currentAuthor" @click="selectAuthor(null)"> + <gl-dropdown-item :is-checked="!currentAuthor" @click="selectAuthor(null)"> {{ __('Any Author') }} - </gl-new-dropdown-item> - <gl-new-dropdown-divider /> - <gl-new-dropdown-item + </gl-dropdown-item> + <gl-dropdown-divider /> + <gl-dropdown-item v-for="author in commitsAuthors" :key="author.id" :is-checked="author.name === currentAuthor" @@ -136,7 +136,7 @@ export default { @click="selectAuthor(author)" > {{ author.name }} - </gl-new-dropdown-item> - </gl-new-dropdown> + </gl-dropdown-item> + </gl-dropdown> </div> </template> diff --git a/app/assets/javascripts/projects/components/project_delete_button.vue b/app/assets/javascripts/projects/components/project_delete_button.vue index 4b27c5e3d30..2f3ff92d7ae 100644 --- a/app/assets/javascripts/projects/components/project_delete_button.vue +++ b/app/assets/javascripts/projects/components/project_delete_button.vue @@ -22,10 +22,10 @@ export default { strings: { alertTitle: __('You are about to permanently delete this project'), alertBody: __( - 'Once a project is permanently deleted it %{strongStart}cannot be recovered%{strongEnd}. Permanently deleting this project will %{strongStart}immediately delete%{strongEnd} its respositories and %{strongStart}all related resources%{strongEnd} including issues, merge requests etc.', + 'Once a project is permanently deleted it %{strongStart}cannot be recovered%{strongEnd}. Permanently deleting this project will %{strongStart}immediately delete%{strongEnd} its repositories and %{strongStart}all related resources%{strongEnd} including issues, merge requests etc.', ), modalBody: __( - "This action cannot be undone. You will lose the project's respository and all conent: issues, merge requests, etc.", + "This action cannot be undone. You will lose the project's repository and all content: issues, merge requests, etc.", ), }, }; diff --git a/app/assets/javascripts/projects/components/shared/delete_button.vue b/app/assets/javascripts/projects/components/shared/delete_button.vue index e3f4500d404..051bfcb732a 100644 --- a/app/assets/javascripts/projects/components/shared/delete_button.vue +++ b/app/assets/javascripts/projects/components/shared/delete_button.vue @@ -86,7 +86,7 @@ export default { <slot name="modal-body"></slot> <p class="gl-mb-1">{{ $options.strings.confirmText }}</p> <p> - <code>{{ confirmPhrase }}</code> + <code class="gl-white-space-pre-wrap">{{ confirmPhrase }}</code> </p> <gl-form-input id="confirm_name_input" diff --git a/app/assets/javascripts/projects/experiment_new_project_creation/components/app.vue b/app/assets/javascripts/projects/experiment_new_project_creation/components/app.vue index ee4a00dbc75..f404e6030f4 100644 --- a/app/assets/javascripts/projects/experiment_new_project_creation/components/app.vue +++ b/app/assets/javascripts/projects/experiment_new_project_creation/components/app.vue @@ -1,4 +1,5 @@ <script> +/* eslint-disable vue/no-v-html */ import { GlBreadcrumb, GlIcon } from '@gitlab/ui'; import WelcomePage from './welcome.vue'; import LegacyContainer from './legacy_container.vue'; diff --git a/app/assets/javascripts/projects/experiment_new_project_creation/components/welcome.vue b/app/assets/javascripts/projects/experiment_new_project_creation/components/welcome.vue index cd9a72996cf..022328cd8a2 100644 --- a/app/assets/javascripts/projects/experiment_new_project_creation/components/welcome.vue +++ b/app/assets/javascripts/projects/experiment_new_project_creation/components/welcome.vue @@ -1,4 +1,5 @@ <script> +/* eslint-disable vue/no-v-html */ import { GlPopover } from '@gitlab/ui'; import Tracking from '~/tracking'; import LegacyContainer from './legacy_container.vue'; diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js index ec0a83b5736..599aa52831b 100644 --- a/app/assets/javascripts/projects/project_new.js +++ b/app/assets/javascripts/projects/project_new.js @@ -1,13 +1,18 @@ import $ from 'jquery'; import DEFAULT_PROJECT_TEMPLATES from 'ee_else_ce/projects/default_project_templates'; import { addSelectOnFocusBehaviour } from '../lib/utils/common_utils'; -import { convertToTitleCase, humanize, slugify } from '../lib/utils/text_utility'; +import { + convertToTitleCase, + humanize, + slugify, + convertUnicodeToAscii, +} from '../lib/utils/text_utility'; let hasUserDefinedProjectPath = false; let hasUserDefinedProjectName = false; const onProjectNameChange = ($projectNameInput, $projectPathInput) => { - const slug = slugify($projectNameInput.val()); + const slug = slugify(convertUnicodeToAscii($projectNameInput.val())); $projectPathInput.val(slug); }; diff --git a/app/assets/javascripts/projects/settings/access_dropdown.js b/app/assets/javascripts/projects/settings/access_dropdown.js index 4dbf6675357..5d51b7ea57b 100644 --- a/app/assets/javascripts/projects/settings/access_dropdown.js +++ b/app/assets/javascripts/projects/settings/access_dropdown.js @@ -4,6 +4,7 @@ import axios from '~/lib/utils/axios_utils'; import { deprecatedCreateFlash as Flash } from '~/flash'; import { n__, s__, __ } from '~/locale'; import { LEVEL_TYPES, LEVEL_ID_PROP, ACCESS_LEVEL_NONE } from './constants'; +import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; export default class AccessDropdown { constructor(options) { @@ -29,7 +30,7 @@ export default class AccessDropdown { initDropdown() { const { onSelect, onHide } = this.options; - this.$dropdown.glDropdown({ + initDeprecatedJQueryDropdown(this.$dropdown, { data: this.getData.bind(this), selectable: true, filterable: true, 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 d61569fcd6e..81367f7d6b4 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 @@ -118,7 +118,10 @@ export default { this.isTemplateSaving = true; this.service .updateTemplate({ selectedTemplate, outgoingName, projectKey }, this.isEnabled) - .then(() => this.showAlert(__('Template was successfully saved.'), 'success')) + .then(({ data }) => { + this.incomingEmail = data?.service_desk_address; + this.showAlert(__('Changes were successfully made.'), 'success'); + }) .catch(() => this.showAlert( __('An error occurred while saving the template. Please check if the template exists.'), 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 0b7433d6aaa..6a0810ad3a1 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 @@ -157,14 +157,16 @@ export default { }} </span> </template> - <gl-button - variant="success" - class="gl-mt-5" - :disabled="isTemplateSaving" - @click="onSaveTemplate" - > - {{ __('Save template') }} - </gl-button> + <div class="gl-display-flex gl-justify-content-end"> + <gl-button + variant="success" + class="gl-mt-5" + :disabled="isTemplateSaving" + @click="onSaveTemplate" + > + {{ __('Save changes') }} + </gl-button> + </div> </div> </div> </div> |