Merge branch 'master' into 'ee-refactor-commit-show'

# Conflicts:
#   config/webpack.config.js

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

 <script>
 import eventHub from '../eventhub';
-import ProjectSelect from './project_select.vue';
+import ProjectSelect from 'ee/boards/components/project_select.vue'; // eslint-disable-line import/first
 import ListIssue from '../models/issue';
 
 const Store = gl.issueBoards.BoardsStore;

app/assets/javascripts/boards/index.js

@@ -2,16 +2,17 @@
 
 import _ from 'underscore';
 import Vue from 'vue';
-import Flash from '../flash';
-import { __ } from '../locale';
+
+import Flash from '~/flash';
+import { __ } from '~/locale';
+
 import FilteredSearchBoards from './filtered_search_boards';
 import eventHub from './eventhub';
-import sidebarEventHub from '../sidebar/event_hub';
+import sidebarEventHub from '~/sidebar/event_hub'; // eslint-disable-line import/first
 import './models/issue';
 import './models/label';
 import './models/list';
 import './models/milestone';
-import './models/project';
 import './models/assignee';
 import './stores/boards_store';
 import './stores/modal_store';
@@ -23,12 +24,13 @@ import './components/board';
 import './components/board_sidebar';
 import './components/new_list_dropdown';
 import './components/modal/index';
-import '../vue_shared/vue_resource_interceptor';
+import '~/vue_shared/vue_resource_interceptor'; // eslint-disable-line import/first
 
-import './components/boards_selector';
-import collapseIcon from './icons/fullscreen_collapse.svg';
-import expandIcon from './icons/fullscreen_expand.svg';
-import tooltip from '../vue_shared/directives/tooltip';
+import 'ee/boards/models/project'; // eslint-disable-line import/first
+import 'ee/boards/components/boards_selector'; // eslint-disable-line import/first
+import collapseIcon from 'ee/boards/icons/fullscreen_collapse.svg'; // eslint-disable-line import/first
+import expandIcon from 'ee/boards/icons/fullscreen_expand.svg'; // eslint-disable-line import/first
+import tooltip from '~/vue_shared/directives/tooltip'; // eslint-disable-line import/first
 
 export default () => {
   const $boardApp = document.getElementById('board-app');

app/assets/javascripts/boards/mixins/sortable_default_options.js

 /* eslint-disable no-unused-vars, no-mixed-operators, comma-dangle */
 /* global DocumentTouch */
 
-import sortableConfig from '../../sortable/sortable_config';
+import sortableConfig from 'ee/sortable/sortable_config';
 
 window.gl = window.gl || {};
 window.gl.issueBoards = window.gl.issueBoards || {};

app/assets/javascripts/boards/models/issue.js

@@ -4,7 +4,7 @@
 /* global ListAssignee */
 
 import Vue from 'vue';
-import IssueProject from './project';
+import IssueProject from 'ee/boards/models/project';
 
 class ListIssue {
   constructor (obj, defaultAvatar) {

app/assets/javascripts/boards/stores/boards_store.js

@@ -3,7 +3,7 @@
 import _ from 'underscore';
 import Cookies from 'js-cookie';
 import boardsStoreEE from 'ee/boards/stores/boards_store_ee';
-import { getUrlParamsArray } from '../../lib/utils/common_utils';
+import { getUrlParamsArray } from '~/lib/utils/common_utils';
 
 window.gl = window.gl || {};
 window.gl.issueBoards = window.gl.issueBoards || {};

app/assets/javascripts/deploy_keys/index.js

 import Vue from 'vue';
 import deployKeysApp from './components/app.vue';
 
-document.addEventListener('DOMContentLoaded', () => new Vue({
+export default () => new Vue({
   el: document.getElementById('js-deploy-keys'),
   components: {
     deployKeysApp,
@@ -18,4 +18,4 @@ document.addEventListener('DOMContentLoaded', () => new Vue({
       },
     });
   },
-}));
+});

app/assets/javascripts/dispatcher.js

@@ -6,177 +6,80 @@ import GlFieldErrors from './gl_field_errors';
 import Shortcuts from './shortcuts';
 import SearchAutocomplete from './search_autocomplete';
 
-var Dispatcher;
-
-(function() {
-  Dispatcher = (function() {
-    function Dispatcher() {
-      this.initSearch();
-      this.initFieldErrors();
-      this.initPageScripts();
-    }
-
-    Dispatcher.prototype.initPageScripts = function() {
-      var path, shortcut_handler;
-      const page = $('body').attr('data-page');
-      if (!page) {
-        return false;
-      }
-
-      const fail = () => Flash('Error loading dynamic module');
-      const callDefault = m => m.default();
-
-      path = page.split(':');
-      shortcut_handler = null;
-
-      $('.js-gfm-input:not(.js-vue-textarea)').each((i, el) => {
-        const gfm = new GfmAutoComplete(gl.GfmAutoComplete && gl.GfmAutoComplete.dataSources);
-        const enableGFM = convertPermissionToBoolean(el.dataset.supportsAutocomplete);
-        gfm.setup($(el), {
-          emojis: true,
-          members: enableGFM,
-          issues: enableGFM,
-          milestones: enableGFM,
-          mergeRequests: enableGFM,
-          labels: enableGFM,
-        });
-      });
-
-      const shortcutHandlerPages = [
-        'projects:activity',
-        'projects:artifacts:browse',
-        'projects:artifacts:file',
-        'projects:blame:show',
-        'projects:blob:show',
-        'projects:commit:show',
-        'projects:commits:show',
-        'projects:find_file:show',
-        'projects:issues:edit',
-        'projects:issues:index',
-        'projects:issues:new',
-        'projects:issues:show',
-        'projects:merge_requests:creations:diffs',
-        'projects:merge_requests:creations:new',
-        'projects:merge_requests:edit',
-        'projects:merge_requests:index',
-        'projects:merge_requests:show',
-        'projects:network:show',
-        'projects:show',
-        'projects:tree:show',
-        'groups:show',
-      ];
+function initSearch() {
+  // Only when search form is present
+  if ($('.search').length) {
+    return new SearchAutocomplete();
+  }
+}
 
-      if (shortcutHandlerPages.indexOf(page) !== -1) {
-        shortcut_handler = true;
-      }
+function initFieldErrors() {
+  $('.gl-show-field-errors').each((i, form) => {
+    new GlFieldErrors(form);
+  });
+}
 
-      switch (path[0]) {
-        case 'admin':
-          switch (path[1]) {
-            case 'broadcast_messages':
-              import('./pages/admin/broadcast_messages')
-                .then(callDefault)
-                .catch(fail);
-              break;
-            case 'cohorts':
-              import('./pages/admin/cohorts')
-                .then(callDefault)
-                .catch(fail);
-              break;
-            case 'groups':
-              switch (path[2]) {
-                case 'show':
-                  import('./pages/admin/groups/show')
-                    .then(callDefault)
-                    .catch(fail);
-                  break;
-              }
-              break;
-            case 'projects':
-              import('./pages/admin/projects')
-                .then(callDefault)
-                .catch(fail);
-              break;
-            case 'labels':
-              switch (path[2]) {
-                case 'new':
-                  import('./pages/admin/labels/new')
-                    .then(callDefault)
-                    .catch(fail);
-                  break;
-                case 'edit':
-                  import('./pages/admin/labels/edit')
-                    .then(callDefault)
-                    .catch(fail);
-                  break;
-              }
-            case 'abuse_reports':
-              import('./pages/admin/abuse_reports')
-                .then(callDefault)
-                .catch(fail);
-              break;
-          }
-          break;
-        case 'profiles':
-          import('./pages/profiles/index')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'projects':
-          import('./pages/projects')
-            .then(callDefault)
-            .catch(fail);
-          shortcut_handler = true;
-          switch (path[1]) {
-            case 'compare':
-              import('./pages/projects/compare')
-                .then(callDefault)
-                .catch(fail);
-              break;
-            case 'create':
-            case 'new':
-              import('./pages/projects/new')
-                .then(callDefault)
-                .catch(fail);
-              break;
-            case 'wikis':
-              import('./pages/projects/wikis')
-                .then(callDefault)
-                .catch(fail);
-              shortcut_handler = true;
-              break;
-          }
-          break;
-      }
-      // If we haven't installed a custom shortcut handler, install the default one
-      if (!shortcut_handler) {
-        new Shortcuts();
-      }
+function initPageShortcuts(page) {
+  const pagesWithCustomShortcuts = [
+    'projects:activity',
+    'projects:artifacts:browse',
+    'projects:artifacts:file',
+    'projects:blame:show',
+    'projects:blob:show',
+    'projects:commit:show',
+    'projects:commits:show',
+    'projects:find_file:show',
+    'projects:issues:edit',
+    'projects:issues:index',
+    'projects:issues:new',
+    'projects:issues:show',
+    'projects:merge_requests:creations:diffs',
+    'projects:merge_requests:creations:new',
+    'projects:merge_requests:edit',
+    'projects:merge_requests:index',
+    'projects:merge_requests:show',
+    'projects:network:show',
+    'projects:show',
+    'projects:tree:show',
+    'groups:show',
+  ];
 
-      if (document.querySelector('#peek')) {
-        import('./performance_bar')
-          .then(m => new m.default({ container: '#peek' })) // eslint-disable-line new-cap
-          .catch(fail);
-      }
-    };
+  if (pagesWithCustomShortcuts.indexOf(page) === -1) {
+    new Shortcuts();
+  }
+}
 
-    Dispatcher.prototype.initSearch = function() {
-      // Only when search form is present
-      if ($('.search').length) {
-        return new SearchAutocomplete();
-      }
-    };
+function initGFMInput() {
+  $('.js-gfm-input:not(.js-vue-textarea)').each((i, el) => {
+    const gfm = new GfmAutoComplete(gl.GfmAutoComplete && gl.GfmAutoComplete.dataSources);
+    const enableGFM = convertPermissionToBoolean(el.dataset.supportsAutocomplete);
+    gfm.setup($(el), {
+      emojis: true,
+      members: enableGFM,
+      issues: enableGFM,
+      milestones: enableGFM,
+      mergeRequests: enableGFM,
+      labels: enableGFM,
+    });
+  });
+}
 
-    Dispatcher.prototype.initFieldErrors = function() {
-      $('.gl-show-field-errors').each((i, form) => {
-        new GlFieldErrors(form);
-      });
-    };
+function initPerformanceBar() {
+  if (document.querySelector('#peek')) {
+    import('./performance_bar')
+      .then(m => new m.default({ container: '#peek' })) // eslint-disable-line new-cap
+      .catch(() => Flash('Error loading performance bar module'));
+  }
+}
 
-    return Dispatcher;
-  })();
-})();
+export default () => {
+  initSearch();
+  initFieldErrors();
 
-export default function initDispatcher() {
-  return new Dispatcher();
-}
+  const page = $('body').attr('data-page');
+  if (page) {
+    initPageShortcuts(page);
+    initGFMInput();
+    initPerformanceBar();
+  }
+};

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

@@ -2,9 +2,10 @@
 /**
  * Render environments table.
  */
+import loadingIcon from '~/vue_shared/components/loading_icon.vue';
 import environmentItem from './environment_item.vue';
-import loadingIcon from '../../vue_shared/components/loading_icon.vue';
-import deployBoard from './deploy_board_component.vue';
+
+import deployBoard from 'ee/environments/components/deploy_board_component.vue'; // eslint-disable-line import/first
 
 export default {
   components: {

app/assets/javascripts/ide/components/repo_file.vue

 <script>
   import { mapState } from 'vuex';
-  import timeAgoMixin from '../../vue_shared/mixins/timeago';
-  import skeletonLoadingContainer from '../../vue_shared/components/skeleton_loading_container.vue';
-  import fileStatusIcon from './repo_file_status_icon.vue';
+
+  import timeAgoMixin from '~/vue_shared/mixins/timeago';
+  import skeletonLoadingContainer from '~/vue_shared/components/skeleton_loading_container.vue';
+  import fileIcon from '~/vue_shared/components/file_icon.vue';
   import newDropdown from './new_dropdown/index.vue';
-  import fileIcon from '../../vue_shared/components/file_icon.vue';
-  import changedFileIcon from './changed_file_icon.vue';
+
+  import fileStatusIcon from 'ee/ide/components/repo_file_status_icon.vue'; // eslint-disable-line import/first
+  import changedFileIcon from 'ee/ide/components/changed_file_icon.vue'; // eslint-disable-line import/first
 
   export default {
     components: {

app/assets/javascripts/ide/components/repo_tab.vue

 <script>
   import { mapActions } from 'vuex';
-  import fileStatusIcon from './repo_file_status_icon.vue';
-  import fileIcon from '../../vue_shared/components/file_icon.vue';
-  import icon from '../../vue_shared/components/icon.vue';
-  import changedFileIcon from './changed_file_icon.vue';
+
+  import fileIcon from '~/vue_shared/components/file_icon.vue';
+  import icon from '~/vue_shared/components/icon.vue';
+
+  import fileStatusIcon from 'ee/ide/components/repo_file_status_icon.vue';
+  import changedFileIcon from 'ee/ide/components/changed_file_icon.vue';
 
   export default {
     components: {

app/assets/javascripts/ide/lib/editor.js

@@ -5,7 +5,7 @@ import Disposable from './common/disposable';
 import ModelManager from './common/model_manager';
 import editorOptions from './editor_options';
 
-import gitlabTheme from './themes/gl_theme';
+import gitlabTheme from 'ee/ide/lib/themes/gl_theme'; // eslint-disable-line import/first
 
 export default class Editor {
   static create(monaco) {

app/assets/javascripts/labels_select.js

@@ -213,7 +213,7 @@ export default class LabelsSelect {
             }
           }
           if (label.duplicate) {
-            color = gl.DropdownUtils.duplicateLabelColor(label.color);
+            color = DropdownUtils.duplicateLabelColor(label.color);
           }
           else {
             if (label.color != null) {

app/assets/javascripts/pages/admin/abuse_reports/index.js

 import AbuseReports from './abuse_reports';
 
-export default () => new AbuseReports();
+document.addEventListener('DOMContentLoaded', () => new AbuseReports());

app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js

@@ -3,7 +3,7 @@ import axios from '~/lib/utils/axios_utils';
 import flash from '~/flash';
 import { __ } from '~/locale';
 
-export default function initBroadcastMessagesForm() {
+export default () => {
   $('input#broadcast_message_color').on('input', function onMessageColorInput() {
     const previewColor = $(this).val();
     $('div.broadcast-message-preview').css('background-color', previewColor);
@@ -32,4 +32,4 @@ export default function initBroadcastMessagesForm() {
       .catch(() => flash(__('An error occurred while rendering preview broadcast message')));
     }
   }, 250));
-}
+};

app/assets/javascripts/pages/admin/broadcast_messages/index.js

 import initBroadcastMessagesForm from './broadcast_message';
 
-export default () => initBroadcastMessagesForm();
+document.addEventListener('DOMContentLoaded', initBroadcastMessagesForm);

app/assets/javascripts/pages/admin/cohorts/index.js

 import initUsagePing from './usage_ping';
 
-export default () => initUsagePing();
+document.addEventListener('DOMContentLoaded', initUsagePing);

app/assets/javascripts/pages/admin/groups/show/index.js

 import UsersSelect from '../../../../users_select';
 
-export default () => new UsersSelect();
+document.addEventListener('DOMContentLoaded', () => new UsersSelect());

app/assets/javascripts/pages/admin/labels/edit/index.js

 import Labels from '../../../../labels';
 
-export default () => new Labels();
+document.addEventListener('DOMContentLoaded', () => new Labels());

app/assets/javascripts/pages/admin/labels/new/index.js

 import Labels from '../../../../labels';
 
-export default () => new Labels();
+document.addEventListener('DOMContentLoaded', () => new Labels());

app/assets/javascripts/pages/admin/projects/index.js

 import ProjectsList from '../../../projects_list';
 import NamespaceSelect from '../../../namespace_select';
 
-export default () => {
+document.addEventListener('DOMContentLoaded', () => {
   new ProjectsList(); // eslint-disable-line no-new
 
   document.querySelectorAll('.js-namespace-select')
     .forEach(dropdown => new NamespaceSelect({ dropdown }));
-};
+});

app/assets/javascripts/pages/profiles/index/index.js

 import NotificationsForm from '../../../notifications_form';
 import notificationsDropdown from '../../../notifications_dropdown';
 
-export default () => {
+document.addEventListener('DOMContentLoaded', () => {
   new NotificationsForm(); // eslint-disable-line no-new
   notificationsDropdown();
-};
+});

app/assets/javascripts/pages/projects/compare/index.js

 import initCompareAutocomplete from '~/compare_autocomplete';
 
-export default () => {
-  initCompareAutocomplete();
-};
+document.addEventListener('DOMContentLoaded', initCompareAutocomplete);

app/assets/javascripts/pages/projects/index.js

 import Project from './project';
 import ShortcutsNavigation from '../../shortcuts_navigation';
 
-export default () => {
+document.addEventListener('DOMContentLoaded', () => {
   new Project(); // eslint-disable-line no-new
   new ShortcutsNavigation(); // eslint-disable-line no-new
-};
+});

app/assets/javascripts/pages/projects/new/index.js

@@ -2,8 +2,8 @@ import ProjectNew from '../shared/project_new';
 import initProjectVisibilitySelector from '../../../project_visibility';
 import initProjectNew from '../../../projects/project_new';
 
-export default () => {
+document.addEventListener('DOMContentLoaded', () => {
   new ProjectNew(); // eslint-disable-line no-new
   initProjectVisibilitySelector();
   initProjectNew.bindEvents();
-};
+});

app/assets/javascripts/pages/projects/settings/repository/show/index.js

 import initSettingsPanels from '~/settings_panels';
+import initDeployKeys from '~/deploy_keys';
 
-document.addEventListener('DOMContentLoaded', initSettingsPanels);
+document.addEventListener('DOMContentLoaded', () => {
+  initDeployKeys();
+  initSettingsPanels();
+});

app/assets/javascripts/pages/projects/wikis/index.js

@@ -3,9 +3,9 @@ import ShortcutsWiki from '../../../shortcuts_wiki';
 import ZenMode from '../../../zen_mode';
 import GLForm from '../../../gl_form';
 
-export default () => {
+document.addEventListener('DOMContentLoaded', () => {
   new Wikis(); // eslint-disable-line no-new
   new ShortcutsWiki(); // eslint-disable-line no-new
   new ZenMode(); // eslint-disable-line no-new
   new GLForm($('.wiki-form'), true); // eslint-disable-line no-new
-};
+});

app/assets/javascripts/pipelines/components/graph/graph_component.vue

 <script>
   import loadingIcon from '~/vue_shared/components/loading_icon.vue';
-  import linkedPipelinesColumn from './linked_pipelines_column.vue';
   import stageColumnComponent from './stage_column_component.vue';
 
+  import linkedPipelinesColumn from 'ee/pipelines/components/graph/linked_pipelines_column.vue'; // eslint-disable-line import/first
+
   export default {
     components: {
       linkedPipelinesColumn,

app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue

 <script>
   /* eslint-disable vue/require-default-prop */
-  import pipelineStage from '../../pipelines/components/stage.vue';
-  import ciIcon from '../../vue_shared/components/ci_icon.vue';
-  import icon from '../../vue_shared/components/icon.vue';
-  import linkedPipelinesMiniList from '../../vue_shared/components/linked_pipelines_mini_list.vue';
+  import pipelineStage from '~/pipelines/components/stage.vue';
+  import ciIcon from '~/vue_shared/components/ci_icon.vue';
+  import icon from '~/vue_shared/components/icon.vue';
+  import linkedPipelinesMiniList from 'ee/vue_shared/components/linked_pipelines_mini_list.vue';
 
   export default {
     name: 'MRWidgetPipeline',

app/controllers/projects/clusters/gcp_controller.rb

@@ -40,9 +40,9 @@ class Projects::Clusters::GcpController < Projects::ApplicationController
   def verify_billing
     case google_project_billing_status
     when nil
-      flash[:alert] = _('We could not verify that one of your projects on GCP has billing enabled. Please try again.')
+      flash.now[:alert] = _('We could not verify that one of your projects on GCP has billing enabled. Please try again.')
     when false
-      flash[:alert] = _('Please <a href=%{link_to_billing} target="_blank" rel="noopener noreferrer">enable billing for one of your projects to be able to create a Kubernetes cluster</a>, then try again.').html_safe % { link_to_billing: "https://console.cloud.google.com/freetrial?utm_campaign=2018_cpanel&utm_source=gitlab&utm_medium=referral" }
+      flash.now[:alert] = _('Please <a href=%{link_to_billing} target="_blank" rel="noopener noreferrer">enable billing for one of your projects to be able to create a Kubernetes cluster</a>, then try again.').html_safe % { link_to_billing: "https://console.cloud.google.com/freetrial?utm_campaign=2018_cpanel&utm_source=gitlab&utm_medium=referral" }
     when true
       return
     end

app/controllers/projects/prometheus/metrics_controller.rb

+module Projects
+  module Prometheus
+    class MetricsController < Projects::ApplicationController
+      before_action :authorize_admin_project!
+
+      def active_common
+        respond_to do |format|
+          format.json do
+            matched_metrics = prometheus_service.matched_metrics || {}
+
+            if matched_metrics.any?
+              render json: matched_metrics
+            else
+              head :no_content
+            end
+          end
+        end
+      end
+
+      private
+
+      def prometheus_service
+        @prometheus_service ||= project.find_or_initialize_service('prometheus')
+      end
+    end
+  end
+end

app/controllers/projects/prometheus_controller.rb

-class Projects::PrometheusController < Projects::ApplicationController
-  before_action :authorize_read_project!
-  before_action :require_prometheus_metrics!
-
-  def active_metrics
-    respond_to do |format|
-      format.json do
-        matched_metrics = project.prometheus_service.matched_metrics || {}
-
-        if matched_metrics.any?
-          render json: matched_metrics
-        else
-          head :no_content
-        end
-      end
-    end
-  end
-
-  private
-
-  def require_prometheus_metrics!
-    render_404 unless project.prometheus_service.present?
-  end
-end

app/models/project_services/prometheus_service.rb

@@ -69,16 +69,16 @@ class PrometheusService < MonitoringService
     client.ping
 
     { success: true, result: 'Checked API endpoint' }
-  rescue Gitlab::PrometheusError => err
+  rescue Gitlab::PrometheusClient::Error => err
     { success: false, result: err }
   end
 
   def environment_metrics(environment)
-    with_reactive_cache(Gitlab::Prometheus::Queries::EnvironmentQuery.name, environment.id, &method(:rename_data_to_metrics))
+    with_reactive_cache(Gitlab::Prometheus::Queries::EnvironmentQuery.name, environment.id, &rename_field(:data, :metrics))
   end
 
   def deployment_metrics(deployment)
-    metrics = with_reactive_cache(Gitlab::Prometheus::Queries::DeploymentQuery.name, deployment.environment.id, deployment.id, &method(:rename_data_to_metrics))
+    metrics = with_reactive_cache(Gitlab::Prometheus::Queries::DeploymentQuery.name, deployment.environment.id, deployment.id, &rename_field(:data, :metrics))
     metrics&.merge(deployment_time: deployment.created_at.to_i) || {}
   end
 
@@ -107,7 +107,7 @@ class PrometheusService < MonitoringService
       data: data,
       last_update: Time.now.utc
     }
-  rescue Gitlab::PrometheusError => err
+  rescue Gitlab::PrometheusClient::Error => err
     { success: false, result: err.message }
   end
 
@@ -116,10 +116,10 @@ class PrometheusService < MonitoringService
       Gitlab::PrometheusClient.new(RestClient::Resource.new(api_url))
     else
       cluster = cluster_with_prometheus(environment_id)
-      raise Gitlab::PrometheusError, "couldn't find cluster with Prometheus installed" unless cluster
+      raise Gitlab::PrometheusClient::Error, "couldn't find cluster with Prometheus installed" unless cluster
 
       rest_client = client_from_cluster(cluster)
-      raise Gitlab::PrometheusError, "couldn't create proxy Prometheus client" unless rest_client
+      raise Gitlab::PrometheusClient::Error, "couldn't create proxy Prometheus client" unless rest_client
 
       Gitlab::PrometheusClient.new(rest_client)
     end
@@ -152,9 +152,11 @@ class PrometheusService < MonitoringService
     cluster.application_prometheus.proxy_client
   end
 
-  def rename_data_to_metrics(metrics)
-    metrics[:metrics] = metrics.delete :data
-    metrics
+  def rename_field(old_field, new_field)
+    -> (metrics) do
+      metrics[new_field] = metrics.delete(old_field)
+      metrics
+    end
   end
 
   def synchronize_service_state!

app/views/admin/runners/index.html.haml

@@ -35,9 +35,8 @@
           method: :put, class: 'btn btn-default',
           data: { confirm: _("Are you sure you want to reset registration token?") }
 
-  = render partial: 'ci/runner/how_to_setup_runner',
-           locals: { registration_token: Gitlab::CurrentSettings.runners_registration_token,
-                     type: 'shared' }
+  = render partial: 'ci/runner/how_to_setup_shared_runner',
+           locals: { registration_token: Gitlab::CurrentSettings.runners_registration_token }
 
   .append-bottom-20.clearfix
     .pull-left

app/views/ci/runner/_how_to_setup_runner.html.haml

 - link = link_to _("GitLab Runner section"), 'https://about.gitlab.com/gitlab-ci/#gitlab-runner', target: '_blank'
-.bs-callout.help-callout
-  %h4= _("How to setup a #{type} Runner for a new project")
+.append-bottom-10
+  %h4= _("Setup a #{type} Runner manually")
 
-  %ol
-    %li
-      = _("Install a Runner compatible with GitLab CI")
-      = (_("(checkout the %{link} for information on how to install it).") % { link: link }).html_safe
-    %li
-      = _("Specify the following URL during the Runner setup:")
-      %code#coordinator_address= root_url(only_path: false)
-    %li
-      = _("Use the following registration token during setup:")
-      %code#registration_token= registration_token
-    %li
-      = _("Start the Runner!")
+%ol
+  %li
+    = _("Install a Runner compatible with GitLab CI")
+    = (_("(checkout the %{link} for information on how to install it).") % { link: link }).html_safe
+  %li
+    = _("Specify the following URL during the Runner setup:")
+    %code#coordinator_address= root_url(only_path: false)
+  %li
+    = _("Use the following registration token during setup:")
+    %code#registration_token= registration_token
+  %li
+    = _("Start the Runner!")

app/views/ci/runner/_how_to_setup_shared_runner.html.haml

+.bs-callout.help-callout
+  = render partial: 'ci/runner/how_to_setup_runner',
+           locals: { registration_token: registration_token, type: 'shared' }

app/views/ci/runner/_how_to_setup_specific_runner.html.haml

+.bs-callout.help-callout
+  .append-bottom-10
+    %h4= _('Setup a specific Runner automatically')
+
+  %p
+    - link_to_help_page = link_to(_('Learn more about Kubernetes'),
+                                  help_page_path('user/project/clusters/index'),
+                                  target: '_blank',
+                                  rel: 'noopener noreferrer')
+
+    = _('You can easily install a Runner on a Kubernetes cluster. %{link_to_help_page}').html_safe % { link_to_help_page: link_to_help_page }
+
+  %ol
+    %li
+      = _('Click the button below to begin the install process by navigating to the Kubernetes page')
+    %li
+      = _('Select an existing Kubernetes cluster or create a new one')
+    %li
+      = _('From the Kubernetes cluster details view, install Runner from the applications list')
+
+  = link_to _('Install Runner on Kubernetes'),
+    project_clusters_path(@project),
+    class: 'btn btn-info'
+  %hr
+  = render partial: 'ci/runner/how_to_setup_runner',
+           locals: { registration_token: registration_token, type: 'specific' }

app/views/projects/clusters/_empty_state.html.haml

@@ -4,7 +4,7 @@
   .col-xs-12
     .text-content
       %h4.text-center= s_('ClusterIntegration|Integrate Kubernetes cluster automation')
-      - link_to_help_page = link_to(s_('ClusterIntegration|Learn more about Kubernetes'), help_page_path('user/project/clusters/index'), target: '_blank', rel: 'noopener noreferrer')
+      - link_to_help_page = link_to(_('Learn more about Kubernetes'), help_page_path('user/project/clusters/index'), target: '_blank', rel: 'noopener noreferrer')
       %p= s_('ClusterIntegration|Kubernetes clusters allow you to use review apps, deploy your applications, run your pipelines, and much more in an easy way. %{link_to_help_page}').html_safe % { link_to_help_page: link_to_help_page}
 
       .text-center

app/views/projects/runners/_shared_runners.html.haml

 %h3 Shared Runners
 
-.bs-callout.bs-callout-warning.shared-runners-description
+.bs-callout.shared-runners-description
   - if Gitlab::CurrentSettings.shared_runners_text.present?
     = markdown_field(Gitlab::CurrentSettings.current_application_settings, :shared_runners_text)
   - else
@@ -9,7 +9,7 @@
     on GitLab.com).
   %hr
   - if @project.shared_runners_enabled?
-    = link_to toggle_shared_runners_project_runners_path(@project), class: 'btn btn-warning', method: :post do
+    = link_to toggle_shared_runners_project_runners_path(@project), class: 'btn btn-close', method: :post do
       Disable shared Runners
   - else
     = link_to toggle_shared_runners_project_runners_path(@project), class: 'btn btn-success', method: :post do

app/views/projects/runners/_specific_runners.html.haml

 %h3 Specific Runners
 
-= render partial: 'ci/runner/how_to_setup_runner',
-         locals: { registration_token: @project.runners_token,
-                   type: 'specific' }
+= render partial: 'ci/runner/how_to_setup_specific_runner',
+         locals: { registration_token: @project.runners_token }
 
 - if @project_runners.any?
   %h4.underlined-title Runners activated for this project

app/views/projects/services/prometheus/_show.html.haml

@@ -7,7 +7,7 @@
       = link_to s_('PrometheusService|More information'), help_page_path('user/project/integrations/prometheus')
 
   .col-lg-9
-    .panel.panel-default.js-panel-monitored-metrics{ data: { "active-metrics" => "#{project_prometheus_active_metrics_path(@project, :json)}" } }
+    .panel.panel-default.js-panel-monitored-metrics{ data: { active_metrics: active_common_project_prometheus_metrics_path(@project, :json) } }
       .panel-heading
         %h3.panel-title
           = s_('PrometheusService|Monitored')

app/views/projects/settings/repository/show.html.haml

@@ -4,7 +4,6 @@
 
 - content_for :page_specific_javascripts do
   = webpack_bundle_tag('common_vue')
-  = webpack_bundle_tag('deploy_keys')
 
 = render "projects/push_rules/index"
 = render "projects/mirrors/show"

app/views/projects/tree/_tree_header.html.haml

@@ -72,6 +72,7 @@
                   #{ _('New tag') }
 
 .tree-controls
+
   = lock_file_link(html_options: { class: 'btn path-lock' })
   = link_to s_('Commits|History'), project_commits_path(@project, @id), class: 'btn'
 

changelogs/unreleased/42044-osw-add-button-to-deploy-runner-to-kubernetes.yml

+---
+title: Add a button to deploy a runner to a Kubernetes cluster in the settings page
+merge_request: 17278
+author:
+type: changed

changelogs/unreleased/43496-error-message-for-gke-clusters-persists-in-the-next-page.yml

+---
+title: Do not persist Google Project verification flash errors after a page reload
+merge_request: 17299
+author:
+type: fixed

changelogs/unreleased/43598-fix-duplicate-label-load-failure.yml

+---
+title: Fix Group labels load failure when there are duplicate labels present
+merge_request: 17353
+author:
+type: fixed

changelogs/unreleased/grpc-unavailable-restart.yml

+---
+title: Restart Unicorn and Sidekiq when GRPC throws 14:Endpoint read failed
+merge_request: 17293
+author:
+type: fixed

changelogs/unreleased/mk-fix-error-code-for-repo-does-not-exist.yml

+---
+title: Return a 404 instead of 403 if the repository does not exist on disk
+merge_request: 17341
+author:
+type: fixed

changelogs/unreleased/refactor-move-filtered-search-vue-component.yml

+---
+title: Move RecentSearchesDropdownContent vue component
+merge_request: 16951
+author: George Tsiolis
+type: performance

config/initializers/sidekiq.rb

@@ -10,7 +10,7 @@ Sidekiq.configure_server do |config|
 
   config.server_middleware do |chain|
     chain.add Gitlab::SidekiqMiddleware::ArgumentsLogger if ENV['SIDEKIQ_LOG_ARGUMENTS']
-    chain.add Gitlab::SidekiqMiddleware::MemoryKiller if ENV['SIDEKIQ_MEMORY_KILLER_MAX_RSS']
+    chain.add Gitlab::SidekiqMiddleware::Shutdown
     chain.add Gitlab::SidekiqMiddleware::RequestStoreMiddleware unless ENV['SIDEKIQ_REQUEST_STORE'] == '0'
     chain.add Gitlab::SidekiqStatus::ServerMiddleware
   end

config/routes/project.rb

@@ -78,7 +78,9 @@ constraints(ProjectUrlConstrainer.new) do
       resource :mattermost, only: [:new, :create]
 
       namespace :prometheus do
-        get :active_metrics
+        resources :metrics, constraints: { id: %r{[^\/]+} }, only: [] do
+          get :active_common, on: :collection
+        end
       end
 
       resources :deploy_keys, constraints: { id: /\d+/ }, only: [:index, :new, :create, :edit, :update] do

config/webpack.config.js

@@ -25,16 +25,10 @@ var NO_COMPRESSION = process.env.NO_COMPRESSION;
 var autoEntries = {};
 var pageEntries = glob.sync('pages/**/index.js', { cwd: path.join(ROOT_PATH, 'app/assets/javascripts') });
 
-// filter out entries currently imported dynamically in dispatcher.js
-var dispatcher = fs.readFileSync(path.join(ROOT_PATH, 'app/assets/javascripts/dispatcher.js')).toString();
-var dispatcherChunks = dispatcher.match(/(?!import\(')\.\/pages\/[^']+/g);
-
 function generateAutoEntries(path, prefix = '.') {
   const chunkPath = path.replace(/\/index\.js$/, '');
-  if (!dispatcherChunks.includes(`${prefix}/${chunkPath}`)) {
-    const chunkName = chunkPath.replace(/\//g, '.');
-    autoEntries[chunkName] = `${prefix}/${path}`;
-  }
+  const chunkName = chunkPath.replace(/\//g, '.');
+  autoEntries[chunkName] = `${prefix}/${path}`;
 }
 
 pageEntries.forEach(( path ) => generateAutoEntries(path));
@@ -55,9 +49,11 @@ var config = {
   context: path.join(ROOT_PATH, 'app/assets/javascripts'),
   entry: {
     balsamiq_viewer:      './blob/balsamiq_viewer.js',
+    blob:                 './blob_edit/blob_bundle.js',
+    common:               './commons/index.js',
+    common_vue:           './vue_shared/vue_resource_interceptor.js',
     cycle_analytics:      './cycle_analytics/cycle_analytics_bundle.js',
     commit_pipelines:     './commit/pipelines/pipelines_bundle.js',
-    deploy_keys:          './deploy_keys/index.js',
     environments:         './environments/environments_bundle.js',
     environments_folder:  './environments/folder/environments_folder_bundle.js',
     filtered_search:      './filtered_search/filtered_search_bundle.js',
@@ -95,19 +91,19 @@ var config = {
     webpack_runtime:      './webpack.js',
 
     // EE-only
-    add_gitlab_slack_application: './add_gitlab_slack_application/index.js',
-    burndown_chart:       './burndown_chart/index.js',
+    add_gitlab_slack_application: 'ee/add_gitlab_slack_application/index.js',
+    burndown_chart:       'ee/burndown_chart/index.js',
     epic_show:            'ee/epics/epic_show/epic_show_bundle.js',
     new_epic:             'ee/epics/new_epic/new_epic_bundle.js',
     geo_nodes:            'ee/geo_nodes',
-    issuable:             './issuable/issuable_bundle.js',
-    issues:               './issues/issues_bundle.js',
-    ldap_group_links:     './groups/ldap_group_links.js',
-    mirrors:              './mirrors',
+    issuable:             'ee/issuable/issuable_bundle.js',
+    issues:               'ee/issues/issues_bundle.js',
+    ldap_group_links:     'ee/groups/ldap_group_links.js',
+    mirrors:              'ee/mirrors',
     ee_protected_branches: 'ee/protected_branches',
     ee_protected_tags:    'ee/protected_tags',
-    service_desk:         './projects/settings_service_desk/service_desk_bundle.js',
-    service_desk_issues:  './service_desk_issues/index.js',
+    service_desk:         'ee/projects/settings_service_desk/service_desk_bundle.js',
+    service_desk_issues:  'ee/service_desk_issues/index.js',
     roadmap:              'ee/roadmap',
     ee_sidebar:           'ee/sidebar/sidebar_bundle.js',
   },
@@ -327,6 +323,7 @@ var config = {
       'images':         path.join(ROOT_PATH, 'app/assets/images'),
       'vendor':         path.join(ROOT_PATH, 'vendor/assets/javascripts'),
       'vue$':           'vue/dist/vue.esm.js',
+      'spec':           path.join(ROOT_PATH, 'spec/javascripts'),
 
       // EE-only
       'ee':              path.join(ROOT_PATH, 'ee/app/assets/javascripts'),

doc/administration/gitaly/index.md

@@ -2,7 +2,9 @@
 
 [Gitaly](https://gitlab.com/gitlab-org/gitaly) (introduced in GitLab
 9.0) is a service that provides high-level RPC access to Git
-repositories. Gitaly is a mandatory component in GitLab 9.4 and newer.
+repositories. Gitaly was optional when it was first introduced in
+GitLab, but since GitLab 9.4 it is a mandatory component of the
+application.
 
 GitLab components that access Git repositories (gitlab-rails,
 gitlab-shell, gitlab-workhorse) act as clients to Gitaly. End users do
@@ -184,14 +186,20 @@ Gitaly logs on your Gitaly server (`sudo gitlab-ctl tail gitaly` or
 coming in. One sure way to trigger a Gitaly request is to clone a
 repository from your GitLab server over HTTP.
 
-## Disabling or enabling the Gitaly service
+## Disabling or enabling the Gitaly service in a cluster environment
 
 If you are running Gitaly [as a remote
 service](#running-gitaly-on-its-own-server) you may want to disable
 the local Gitaly service that runs on your Gitlab server by default.
 
-To disable the Gitaly service in your Omnibus installation, add the
-following line to `/etc/gitlab/gitlab.rb`:
+> 'Disabling Gitaly' only makes sense when you run GitLab in a custom
+cluster configuration, where different services run on different
+machines. Disabling Gitaly on all machines in the cluster is not a
+valid configuration.
+
+If you are setting up a GitLab cluster where Gitaly does not need to
+run on all machines, you can disable the Gitaly service in your
+Omnibus installation, add the following line to `/etc/gitlab/gitlab.rb`:
 
 ```ruby
 gitaly['enable'] = false
@@ -200,11 +208,13 @@ gitaly['enable'] = false
 When you run `gitlab-ctl reconfigure` the Gitaly service will be
 disabled.
 
-To disable the Gitaly service in an installation from source, add the
-following to `/etc/default/gitlab`:
+To disable the Gitaly service in a GitLab cluster where you installed
+GitLab from source, add the following to `/etc/default/gitlab` on the
+machine where you want to disable Gitaly.
 
 ```shell
 gitaly_enabled=false
 ```
 
-When you run `service gitlab restart` Gitaly will be disabled.
+When you run `service gitlab restart` Gitaly will be disabled on this
+particular machine.

doc/api/projects.md

@@ -1234,7 +1234,7 @@ POST /projects/:id/hooks
 | `note_events` | boolean | no | Trigger hook on note events |
 | `job_events` | boolean | no | Trigger hook on job events |
 | `pipeline_events` | boolean | no | Trigger hook on pipeline events |
-| `wiki_events` | boolean | no | Trigger hook on wiki events |
+| `wiki_page_events` | boolean | no | Trigger hook on wiki events |
 | `enable_ssl_verification` | boolean | no | Do SSL verification when triggering the hook |
 | `token` | string | no | Secret token to validate received payloads; this will not be returned in the response |
 

doc/user/project/merge_requests/merge_request_approvals.md

@@ -81,8 +81,8 @@ the following is possible:
       ![Approve](img/approve.png)
 
   - If the required number of approvals has already been met, they can still
-    approve it by clicking the displayed **Approve additionally** button.
-      ![Approve additionally](img/approve_additionally.png)
+    approve it by clicking the displayed **Add approval** button.
+      ![Add approval](img/approve_additionally.png)
 
     ---
 

doc/user/project/milestones/index.md

@@ -8,8 +8,8 @@ Milestones allow you to organize issues and merge requests into a cohesive group
 
 ## Project milestones and group milestones
 
-- **Project milestones** can be assigned to issues or merge requests in that project only. 
-- **Group milestones** can be assigned to any issue or merge request of any project in that group. 
+- **Project milestones** can be assigned to issues or merge requests in that project only.
+- **Group milestones** can be assigned to any issue or merge request of any project in that group.
 - In the [future](https://gitlab.com/gitlab-org/gitlab-ce/issues/36862), you will be able to assign group milestones to issues and merge reqeusts of projects in [subgroups](../../group/subgroups/index.md).
 
 ## Creating milestones

app/assets/javascripts/add_gitlab_slack_application/components/add_gitlab_slack_application.vue → ee/app/assets/javascripts/add_gitlab_slack_application/components/add_gitlab_slack_application.vue

 <script>
   import Flash from '~/flash';
+  import { redirectTo } from '~/lib/utils/url_utility';
+
   import GitlabSlackService from '../services/gitlab_slack_service';
-  import { redirectTo } from '../../lib/utils/url_utility';
 
   export default {
     props: {

app/assets/javascripts/add_gitlab_slack_application/services/gitlab_slack_service.js → ee/app/assets/javascripts/add_gitlab_slack_application/services/gitlab_slack_service.js

-import axios from '../../lib/utils/axios_utils';
+import axios from '~/lib/utils/axios_utils';
 
 export default {
   addToSlack(url, projectId) {

app/assets/javascripts/boards/components/board_form.vue → ee/app/assets/javascripts/boards/components/board_form.vue

@@ -2,8 +2,8 @@
 /* global BoardService */
 
 import Flash from '~/flash';
-import modal from '../../vue_shared/components/modal.vue';
-import { visitUrl } from '../../lib/utils/url_utility';
+import modal from '~/vue_shared/components/modal.vue';
+import { visitUrl } from '~/lib/utils/url_utility';
 import BoardMilestoneSelect from './milestone_select.vue';
 import BoardWeightSelect from './weight_select.vue';
 import BoardLabelsSelect from './labels_select.vue';

app/assets/javascripts/boards/components/project_select.vue → ee/app/assets/javascripts/boards/components/project_select.vue

 <script>
   /* global ListIssue */
   import _ from 'underscore';
-  import eventHub from '../eventhub';
-  import loadingIcon from '../../vue_shared/components/loading_icon.vue';
-  import Api from '../../api';
+  import eventHub from '~/boards/eventhub';
+  import loadingIcon from '~/vue_shared/components/loading_icon.vue';
+  import Api from '~/api';
 
   export default {
     name: 'BoardProjectSelect',

app/assets/javascripts/environments/components/deploy_board_component.vue → ee/app/assets/javascripts/environments/components/deploy_board_component.vue

@@ -9,10 +9,10 @@
    * [Mockup](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2f655655c0eadf655d0ae7467b53002a/environments__deploy-graphic.png)
    */
   import _ from 'underscore';
+  import { n__ } from '~/locale';
+  import loadingIcon from '~/vue_shared/components/loading_icon.vue';
   import deployBoardSvg from 'ee_empty_states/icons/_deploy_board.svg';
-  import { n__ } from '../../locale';
   import instanceComponent from './deploy_board_instance_component.vue';
-  import loadingIcon from '../../vue_shared/components/loading_icon.vue';
 
   export default {
     components: {

app/assets/javascripts/environments/components/deploy_board_instance_component.vue → ee/app/assets/javascripts/environments/components/deploy_board_instance_component.vue

@@ -12,7 +12,7 @@
    * this information in the tooltip and the colors.
    * Mockup is https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1551#note_26595150
    */
-  import tooltip from '../../vue_shared/directives/tooltip';
+  import tooltip from '~/vue_shared/directives/tooltip';
 
   export default {
     directives: {

ee/app/assets/javascripts/epics/epic_show/components/epic_show_app.vue

 <script>
   /* eslint-disable vue/require-default-prop */
   import issuableApp from '~/issue_show/components/app.vue';
-  import relatedIssuesRoot from '~/issuable/related_issues/components/related_issues_root.vue';
+  import relatedIssuesRoot from 'ee/issuable/related_issues/components/related_issues_root.vue';
   import issuableAppEventHub from '~/issue_show/event_hub';
   import epicHeader from './epic_header.vue';
   import epicSidebar from '../../sidebar/components/sidebar_app.vue';

app/assets/javascripts/ide/components/changed_file_icon.vue → ee/app/assets/javascripts/ide/components/changed_file_icon.vue

 <script>
-  import icon from '../../vue_shared/components/icon.vue';
+  import icon from '~/vue_shared/components/icon.vue';
 
   export default {
     components: {

app/assets/javascripts/ide/components/repo_file_status_icon.vue → ee/app/assets/javascripts/ide/components/repo_file_status_icon.vue

 <script>
-  import icon from '../../vue_shared/components/icon.vue';
-  import tooltip from '../../vue_shared/directives/tooltip';
-  import '../../lib/utils/datetime_utility';
+  import icon from '~/vue_shared/components/icon.vue';
+  import tooltip from '~/vue_shared/directives/tooltip';
+  import '~/lib/utils/datetime_utility';
 
   export default {
     components: {

app/assets/javascripts/issuable/issuable_bundle.js → ee/app/assets/javascripts/issuable/issuable_bundle.js

 import Vue from 'vue';
+import { convertPermissionToBoolean } from '~/lib/utils/common_utils';
 import RelatedIssuesRoot from './related_issues/components/related_issues_root.vue';
-import { convertPermissionToBoolean } from '../lib/utils/common_utils';
 
 document.addEventListener('DOMContentLoaded', () => {
   const relatedIssuesRootElement = document.querySelector('.js-related-issues-root');

app/assets/javascripts/issuable/related_issues/components/related_issues_block.vue → ee/app/assets/javascripts/issuable/related_issues/components/related_issues_block.vue

@@ -2,7 +2,7 @@
 import Sortable from 'vendor/Sortable';
 import loadingIcon from '~/vue_shared/components/loading_icon.vue';
 import tooltip from '~/vue_shared/directives/tooltip';
-import sortableConfig from '~/sortable/sortable_config';
+import sortableConfig from 'ee/sortable/sortable_config';
 import eventHub from '../event_hub';
 import issueItem from './issue_item.vue';
 import addIssuableForm from './add_issuable_form.vue';

app/assets/javascripts/issuable/related_issues/components/related_issues_root.vue → ee/app/assets/javascripts/issuable/related_issues/components/related_issues_root.vue

@@ -24,7 +24,7 @@ Your caret can stop touching a `rawReference` can happen in a variety of ways:
 
 */
 import _ from 'underscore';
-import Flash from '../../../flash';
+import Flash from '~/flash';
 import eventHub from '../event_hub';
 import RelatedIssuesBlock from './related_issues_block.vue';
 import RelatedIssuesStore from '../stores/related_issues_store';

app/assets/javascripts/issuable/related_issues/mixins/related_issues_mixin.js → ee/app/assets/javascripts/issuable/related_issues/mixins/related_issues_mixin.js

-import tooltip from '../../../vue_shared/directives/tooltip';
-import icon from '../../../vue_shared/components/icon.vue';
+import tooltip from '~/vue_shared/directives/tooltip';
+import icon from '~/vue_shared/components/icon.vue';
 import eventHub from '../event_hub';
 
 const mixins = {

app/assets/javascripts/mirrors/mirror_pull.js → ee/app/assets/javascripts/mirrors/mirror_pull.js

 import _ from 'underscore';
 import { __ } from '~/locale';
 import axios from '~/lib/utils/axios_utils';
-import Flash from '../flash';
+import Flash from '~/flash';
+import { backOff } from '~/lib/utils/common_utils';
 import AUTH_METHOD from './constants';
-import { backOff } from '../lib/utils/common_utils';
 
 export default class MirrorPull {
   constructor(formSelector) {

app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue → ee/app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue

 <script>
-  import ciStatus from '../../../vue_shared/components/ci_icon.vue';
-  import tooltip from '../../../vue_shared/directives/tooltip';
+  import ciStatus from '~/vue_shared/components/ci_icon.vue';
+  import tooltip from '~/vue_shared/directives/tooltip';
 
   export default {
     directives: {

app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue → ee/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue

 <script>
-  import Flash from '../../../flash';
+  import Flash from '~/flash';
   import serviceDeskSetting from './service_desk_setting.vue';
   import ServiceDeskStore from '../stores/service_desk_store';
   import ServiceDeskService from '../services/service_desk_service';

app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue → ee/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue

 <script>
+  import tooltip from '~/vue_shared/directives/tooltip';
   import eventHub from '../event_hub';
-  import tooltip from '../../../vue_shared/directives/tooltip';
 
   export default {
     name: 'ServiceDeskSetting',

app/assets/javascripts/projects/settings_service_desk/service_desk_bundle.js → ee/app/assets/javascripts/projects/settings_service_desk/service_desk_bundle.js

 import Vue from 'vue';
+import { convertPermissionToBoolean } from '~/lib/utils/common_utils';
 import serviceDeskRoot from './components/service_desk_root.vue';
-import { convertPermissionToBoolean } from '../../lib/utils/common_utils';
 
 document.addEventListener('DOMContentLoaded', () => {
   const serviceDeskRootElement = document.querySelector('.js-service-desk-setting-root');