From d948f526eaf995c32699fe9e02c2a7c47b78b635 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 19 Sep 2019 15:06:08 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../badges/components/badge_settings.vue | 4 +- app/assets/javascripts/blob/template_selector.js | 1 + app/assets/javascripts/create_item_dropdown.js | 1 + .../components/stop_environment_modal.vue | 4 +- .../ide/components/commit_sidebar/list.vue | 4 +- .../ide/components/commit_sidebar/stage_button.vue | 4 +- .../ide/components/new_dropdown/modal.vue | 4 +- app/assets/javascripts/namespace_select.js | 1 + .../jobs/index/components/stop_jobs_modal.vue | 4 +- .../pages/dashboard/todos/index/todos.js | 1 + .../shared/components/promote_milestone_modal.vue | 4 +- .../labels/components/promote_label_modal.vue | 4 +- app/assets/javascripts/pages/search/show/search.js | 1 + .../performance_bar/components/detailed_metric.vue | 4 +- .../pipelines/components/pipeline_stop_modal.vue | 4 +- .../profile/account/components/update_username.vue | 4 +- app/assets/javascripts/ref_select_dropdown.js | 1 + .../javascripts/reports/components/modal.vue | 4 +- .../javascripts/sidebar/lib/sidebar_move_issue.js | 1 + .../vue_shared/components/deprecated_modal_2.vue | 118 +++++++++++++++++++++ .../javascripts/vue_shared/components/gl_modal.vue | 117 +------------------- .../project_selector/project_selector.vue | 2 +- 22 files changed, 153 insertions(+), 139 deletions(-) create mode 100644 app/assets/javascripts/vue_shared/components/deprecated_modal_2.vue (limited to 'app/assets') diff --git a/app/assets/javascripts/badges/components/badge_settings.vue b/app/assets/javascripts/badges/components/badge_settings.vue index 75a522efe7e..531f84ad272 100644 --- a/app/assets/javascripts/badges/components/badge_settings.vue +++ b/app/assets/javascripts/badges/components/badge_settings.vue @@ -2,7 +2,7 @@ import { mapState, mapActions } from 'vuex'; import createFlash from '~/flash'; import { s__ } from '~/locale'; -import GlModal from '~/vue_shared/components/gl_modal.vue'; +import DeprecatedModal2 from '~/vue_shared/components/deprecated_modal_2.vue'; import Badge from './badge.vue'; import BadgeForm from './badge_form.vue'; import BadgeList from './badge_list.vue'; @@ -13,7 +13,7 @@ export default { Badge, BadgeForm, BadgeList, - GlModal, + GlModal: DeprecatedModal2, }, computed: { ...mapState(['badgeInModal', 'isEditing']), diff --git a/app/assets/javascripts/blob/template_selector.js b/app/assets/javascripts/blob/template_selector.js index 9e69c7d7164..02216e4e93d 100644 --- a/app/assets/javascripts/blob/template_selector.js +++ b/app/assets/javascripts/blob/template_selector.js @@ -1,6 +1,7 @@ /* eslint-disable class-methods-use-this */ import $ from 'jquery'; +import '~/gl_dropdown'; export default class TemplateSelector { constructor({ dropdown, data, pattern, wrapper, editor, $input } = {}) { diff --git a/app/assets/javascripts/create_item_dropdown.js b/app/assets/javascripts/create_item_dropdown.js index fa0f04c7d82..95b890b04c1 100644 --- a/app/assets/javascripts/create_item_dropdown.js +++ b/app/assets/javascripts/create_item_dropdown.js @@ -1,4 +1,5 @@ import _ from 'underscore'; +import '~/gl_dropdown'; export default class CreateItemDropdown { /** diff --git a/app/assets/javascripts/environments/components/stop_environment_modal.vue b/app/assets/javascripts/environments/components/stop_environment_modal.vue index 2cc3412e075..1ea4e30a7c1 100644 --- a/app/assets/javascripts/environments/components/stop_environment_modal.vue +++ b/app/assets/javascripts/environments/components/stop_environment_modal.vue @@ -1,7 +1,7 @@ + + diff --git a/app/assets/javascripts/vue_shared/components/gl_modal.vue b/app/assets/javascripts/vue_shared/components/gl_modal.vue index 438851e5ac7..4b91d4c00e3 100644 --- a/app/assets/javascripts/vue_shared/components/gl_modal.vue +++ b/app/assets/javascripts/vue_shared/components/gl_modal.vue @@ -1,117 +1,6 @@ - - diff --git a/app/assets/javascripts/vue_shared/components/project_selector/project_selector.vue b/app/assets/javascripts/vue_shared/components/project_selector/project_selector.vue index 7f0345c7ec0..478e44d104c 100644 --- a/app/assets/javascripts/vue_shared/components/project_selector/project_selector.vue +++ b/app/assets/javascripts/vue_shared/components/project_selector/project_selector.vue @@ -52,7 +52,7 @@ export default { this.$emit('projectClicked', project); }, isSelected(project) { - return Boolean(_.findWhere(this.selectedProjects, { id: project.id })); + return Boolean(_.find(this.selectedProjects, { id: project.id })); }, onInput: _.debounce(function debouncedOnInput() { this.$emit('searched', this.searchQuery); -- cgit v1.2.1