Add latest changes from gitlab-org/gitlab@12-0-stable-ee

app/assets/javascripts/gfm_auto_complete.js

 import $ from 'jquery';
 import 'at.js';
 import _ from 'underscore';
+
 import glRegexp from './lib/utils/regexp';
 import AjaxCache from './lib/utils/ajax_cache';

app/assets/javascripts/main.js

@@ -33,6 +33,9 @@ import GlFieldErrors from './gl_field_errors';
 import initUserPopovers from './user_popovers';
 import { __ } from './locale';
+// EE-only scripts
+import 'ee/main';
+
 // expose jQuery as global (TODO: remove these)
 window.jQuery = jQuery;
 window.$ = jQuery;

app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue

@@ -37,6 +37,11 @@ export default {
       required: false,
       default: false,
     },
+    packagesAvailable: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
     visibilityHelpPath: {
       type: String,
       required: false,
@@ -67,6 +72,11 @@ export default {
       required: false,
       default: '',
     },
+    packagesHelpPath: {
+      type: String,
+      required: false,
+      default: '',
+    },
   },
   data() {
@@ -82,6 +92,7 @@ export default {
       pagesAccessLevel: 20,
       containerRegistryEnabled: true,
       lfsEnabled: true,
+      packagesEnabled: true,
       requestAccessEnabled: true,
       highlightChangesClass: false,
     };
@@ -157,12 +168,14 @@ export default {
         if (value === 0) {
           this.containerRegistryEnabled = false;
           this.lfsEnabled = false;
+          this.packagesEnabled = false;
         }
       } else if (oldValue === 0) {
         this.mergeRequestsAccessLevel = value;
         this.buildsAccessLevel = value;
         this.containerRegistryEnabled = true;
         this.lfsEnabled = true;
+        this.packagesEnabled = true;
       }
     },
@@ -299,6 +312,18 @@ export default {
             name="project[lfs_enabled]"
           />
         </project-setting-row>
+        <project-setting-row
+          v-if="packagesAvailable"
+          :help-path="packagesHelpPath"
+          label="Packages"
+          help-text="Every project can have its own space to store its packages"
+        >
+          <project-feature-toggle
+            v-model="packagesEnabled"
+            :disabled-input="!repositoryEnabled"
+            name="project[packages_enabled]"
+          />
+        </project-setting-row>
       </div>
       <project-setting-row label="Wiki" help-text="Pages for project documentation">
         <project-feature-setting

app/assets/javascripts/pipelines/pipeline_details_mediator.js

@@ -2,8 +2,8 @@ import Visibility from 'visibilityjs';
 import Flash from '../flash';
 import Poll from '../lib/utils/poll';
 import { __ } from '../locale';
-import PipelineStore from './stores/pipeline_store';
-import PipelineService from './services/pipeline_service';
+import PipelineService from '~/pipelines/services/pipeline_service';
+import PipelineStore from 'ee/pipelines/stores/pipeline_store'; // eslint-disable-line import/order
 export default class pipelinesMediator {
   constructor(options = {}) {

app/assets/javascripts/reports/components/report_item.vue

 <script>
 import IssueStatusIcon from '~/reports/components/issue_status_icon.vue';
-import { components, componentNames } from '~/reports/components/issue_body';
+import { components, componentNames } from 'ee/vue_shared/components/reports/issue_body';
 export default {
   name: 'ReportItem',

app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue

@@ -65,9 +65,6 @@ export default {
       :title="timeRemainingTooltip"
       :class="timeRemainingStatusClass"
       class="compare-meter"
-      data-toggle="tooltip"
-      data-placement="top"
-      role="timeRemainingDisplay"
     >
       <gl-progress-bar :value="timeRemainingPercent" :variant="progressBarVariant" />
       <div class="compare-display-container">

app/assets/javascripts/sidebar/sidebar_mediator.js

+import Store from 'ee/sidebar/stores/sidebar_store';
 import { visitUrl } from '../lib/utils/url_utility';
 import Flash from '../flash';
 import Service from './services/sidebar_service';
-import Store from './stores/sidebar_store';
 import { __ } from '~/locale';
 export default class SidebarMediator {

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

@@ -92,7 +92,6 @@ export default {
   },
 };
 </script>
-
 <template>
   <div class="ci-widget media js-ci-widget">
     <template v-if="!hasPipeline || hasCIError">
@@ -191,6 +190,7 @@ export default {
                 </div>
               </template>
             </span>
+
             <linked-pipelines-mini-list v-if="triggered.length" :triggered="triggered" />
           </span>
         </div>

app/assets/javascripts/vue_shared/components/gl_countdown.vue

@@ -9,6 +9,7 @@ export default {
   directives: {
     GlTooltip: GlTooltipDirective,
   },
+
   props: {
     endDateString: {
       type: String,

app/assets/stylesheets/application.scss

@@ -34,4 +34,8 @@
 // Styles for JS behaviors.
 @import "behaviors";
+// EE-only stylesheets
+@import "../../../ee/app/assets/stylesheets/**/*";
+
+// CSS util classes
 @import "utilities";

app/controllers/admin/application_controller.rb

@@ -8,3 +8,5 @@ class Admin::ApplicationController < ApplicationController
   layout 'admin'
 end
+
+Admin::ApplicationController.prepend(EE::Admin::ApplicationController)

app/controllers/admin/application_settings_controller.rb

@@ -158,3 +158,5 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
     ]
   end
 end
+
+Admin::ApplicationSettingsController.prepend(EE::Admin::ApplicationSettingsController)

app/controllers/admin/dashboard_controller.rb

@@ -15,3 +15,5 @@ class Admin::DashboardController < Admin::ApplicationController
   end
   # rubocop: enable CodeReuse/ActiveRecord
 end
+
+Admin::DashboardController.prepend(EE::Admin::DashboardController)

app/controllers/admin/groups_controller.rb

@@ -94,3 +94,5 @@ class Admin::GroupsController < Admin::ApplicationController
     ]
   end
 end
+
+Admin::GroupsController.prepend(EE::Admin::GroupsController)

app/controllers/admin/health_check_controller.rb

@@ -11,3 +11,5 @@ class Admin::HealthCheckController < Admin::ApplicationController
     ['standard']
   end
 end
+
+Admin::HealthCheckController.prepend(EE::Admin::HealthCheckController)

app/controllers/admin/logs_controller.rb

@@ -20,3 +20,5 @@ class Admin::LogsController < Admin::ApplicationController
     ]
   end
 end
+
+Admin::LogsController.prepend(EE::Admin::LogsController)

app/controllers/admin/projects_controller.rb

@@ -76,3 +76,5 @@ class Admin::ProjectsController < Admin::ApplicationController
     @group ||= @project.group
   end
 end
+
+Admin::ProjectsController.prepend(EE::Admin::ProjectsController)

app/controllers/admin/users_controller.rb

@@ -237,3 +237,5 @@ class Admin::UsersController < Admin::ApplicationController
     access_denied! unless Gitlab.config.gitlab.impersonation_enabled
   end
 end
+
+Admin::UsersController.prepend(EE::Admin::UsersController)

app/controllers/application_controller.rb

@@ -517,3 +517,5 @@ class ApplicationController < ActionController::Base
     Gitlab::Sentry.context(current_user)
   end
 end
+
+ApplicationController.prepend(EE::ApplicationController)

app/controllers/autocomplete_controller.rb

@@ -46,3 +46,5 @@ class AutocompleteController < ApplicationController
     render json: target_branches.map { |target_branch| { title: target_branch } }
   end
 end
+
+AutocompleteController.prepend(EE::AutocompleteController)