Add latest changes from gitlab-org/gitlab@master

18 files changed, 43 insertions, 93 deletions

diff --git a/app/assets/javascripts/jira_connect/components/app.vue b/app/assets/javascripts/jira_connect/components/app.vue
index 4290971623e..51f27182577 100644
--- a/app/assets/javascripts/jira_connect/components/app.vue
+++ b/app/assets/javascripts/jira_connect/components/app.vue
@@ -31,9 +31,6 @@ export default {
   },
   computed: {
     ...mapState(['errorMessage']),
-    showNewUI() {
-      return this.glFeatures.newJiraConnectUi;
-    },
     usersPathWithReturnTo() {
       if (this.location) {
         return `${this.usersPath}?return_to=${this.location}`;
@@ -67,7 +64,6 @@ export default {
     <h2 class="gl-text-center">{{ s__('JiraService|GitLab for Jira Configuration') }}</h2>
 
     <div
-      v-if="showNewUI"
       class="jira-connect-app-body gl-display-flex gl-justify-content-space-between gl-my-7 gl-pb-4 gl-border-b-solid gl-border-b-1 gl-border-b-gray-200"
     >
       <h5 class="gl-align-self-center gl-mb-0" data-testid="new-jira-connect-ui-heading">
diff --git a/app/assets/javascripts/notes/components/comment_form.vue b/app/assets/javascripts/notes/components/comment_form.vue
index 2866b1a8362..5f70b3a74eb 100644
--- a/app/assets/javascripts/notes/components/comment_form.vue
+++ b/app/assets/javascripts/notes/components/comment_form.vue
@@ -180,9 +180,6 @@ export default {
     trackingLabel() {
       return slugifyWithUnderscore(`${this.commentButtonTitle} button`);
     },
-    hasCloseAndCommentButton() {
-      return !this.glFeatures.removeCommentCloseReopen;
-    },
     confidentialNotesEnabled() {
       return Boolean(this.glFeatures.confidentialNotes);
     },
@@ -426,7 +423,7 @@ export default {
                 </gl-dropdown-item>
               </gl-dropdown>
               <gl-button
-                v-if="hasCloseAndCommentButton && canToggleIssueState"
+                v-if="canToggleIssueState"
                 :loading="isToggleStateButtonLoading"
                 category="secondary"
                 :variant="buttonVariant"
diff --git a/app/assets/javascripts/pages/projects/branches/new/index.js b/app/assets/javascripts/pages/projects/branches/new/index.js
index 13ff47d53c2..364223f1898 100644
--- a/app/assets/javascripts/pages/projects/branches/new/index.js
+++ b/app/assets/javascripts/pages/projects/branches/new/index.js
@@ -1,11 +1,8 @@
 import $ from 'jquery';
 import NewBranchForm from '~/new_branch_form';
 
-document.addEventListener(
-  'DOMContentLoaded',
-  () =>
-    new NewBranchForm(
-      $('.js-create-branch-form'),
-      JSON.parse(document.getElementById('availableRefs').innerHTML),
-    ),
+// eslint-disable-next-line no-new
+new NewBranchForm(
+  $('.js-create-branch-form'),
+  JSON.parse(document.getElementById('availableRefs').innerHTML),
 );
diff --git a/app/assets/javascripts/pages/projects/logs/index.js b/app/assets/javascripts/pages/projects/logs/index.js
index 36747069ebb..0cff1ffc27e 100644
--- a/app/assets/javascripts/pages/projects/logs/index.js
+++ b/app/assets/javascripts/pages/projects/logs/index.js
@@ -1,3 +1,3 @@
 import logsBundle from '~/logs';
 
-document.addEventListener('DOMContentLoaded', logsBundle);
+logsBundle();
diff --git a/app/assets/javascripts/pages/projects/milestones/index/index.js b/app/assets/javascripts/pages/projects/milestones/index/index.js
index 38789365a67..150b506b121 100644
--- a/app/assets/javascripts/pages/projects/milestones/index/index.js
+++ b/app/assets/javascripts/pages/projects/milestones/index/index.js
@@ -1,3 +1,3 @@
 import milestones from '~/pages/milestones/shared';
 
-document.addEventListener('DOMContentLoaded', milestones);
+milestones();
diff --git a/app/assets/javascripts/pages/projects/new/index.js b/app/assets/javascripts/pages/projects/new/index.js
index 437594fdf11..e10e2872dce 100644
--- a/app/assets/javascripts/pages/projects/new/index.js
+++ b/app/assets/javascripts/pages/projects/new/index.js
@@ -3,28 +3,26 @@ import { __ } from '~/locale';
 import initProjectVisibilitySelector from '../../../project_visibility';
 import initProjectNew from '../../../projects/project_new';
 
-document.addEventListener('DOMContentLoaded', () => {
-  initProjectVisibilitySelector();
-  initProjectNew.bindEvents();
+initProjectVisibilitySelector();
+initProjectNew.bindEvents();
 
-  import(
-    /* webpackChunkName: 'experiment_new_project_creation' */ '../../../projects/experiment_new_project_creation'
-  )
-    .then((m) => {
-      const el = document.querySelector('.js-experiment-new-project-creation');
+import(
+  /* webpackChunkName: 'experiment_new_project_creation' */ '../../../projects/experiment_new_project_creation'
+)
+  .then((m) => {
+    const el = document.querySelector('.js-experiment-new-project-creation');
 
-      if (!el) {
-        return;
-      }
+    if (!el) {
+      return;
+    }
 
-      const config = {
-        hasErrors: 'hasErrors' in el.dataset,
-        isCiCdAvailable: 'isCiCdAvailable' in el.dataset,
-        newProjectGuidelines: el.dataset.newProjectGuidelines,
-      };
-      m.default(el, config);
-    })
-    .catch(() => {
-      createFlash(__('An error occurred while loading project creation UI'));
-    });
-});
+    const config = {
+      hasErrors: 'hasErrors' in el.dataset,
+      isCiCdAvailable: 'isCiCdAvailable' in el.dataset,
+      newProjectGuidelines: el.dataset.newProjectGuidelines,
+    };
+    m.default(el, config);
+  })
+  .catch(() => {
+    createFlash(__('An error occurred while loading project creation UI'));
+  });
diff --git a/app/assets/javascripts/pages/projects/prometheus/metrics/edit/index.js b/app/assets/javascripts/pages/projects/prometheus/metrics/edit/index.js
index 2fd047675b9..82856c1c8b9 100644
--- a/app/assets/javascripts/pages/projects/prometheus/metrics/edit/index.js
+++ b/app/assets/javascripts/pages/projects/prometheus/metrics/edit/index.js
@@ -1,3 +1,3 @@
-import customMetrics from '~/custom_metrics';
+import CustomMetrics from '~/custom_metrics';
 
-document.addEventListener('DOMContentLoaded', customMetrics);
+CustomMetrics();
diff --git a/app/assets/javascripts/pages/projects/prometheus/metrics/new/index.js b/app/assets/javascripts/pages/projects/prometheus/metrics/new/index.js
index 2fd047675b9..82856c1c8b9 100644
--- a/app/assets/javascripts/pages/projects/prometheus/metrics/new/index.js
+++ b/app/assets/javascripts/pages/projects/prometheus/metrics/new/index.js
@@ -1,3 +1,3 @@
-import customMetrics from '~/custom_metrics';
+import CustomMetrics from '~/custom_metrics';
 
-document.addEventListener('DOMContentLoaded', customMetrics);
+CustomMetrics();
diff --git a/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue b/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
index 94a9bc168e5..4af6af16980 100644
--- a/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
+++ b/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
@@ -613,7 +613,9 @@ export default {
       <project-setting-row
         ref="operations-settings"
         :label="s__('ProjectSettings|Operations')"
-        :help-text="s__('ProjectSettings|Environments, logs, cluster management, and more.')"
+        :help-text="
+          s__('ProjectSettings|Configure your project resources and monitor their health.')
+        "
       >
         <project-feature-setting
           v-model="operationsAccessLevel"
diff --git a/app/assets/javascripts/pages/projects/tags/releases/index.js b/app/assets/javascripts/pages/projects/tags/releases/index.js
index abdc97f62d0..cafd880b4be 100644
--- a/app/assets/javascripts/pages/projects/tags/releases/index.js
+++ b/app/assets/javascripts/pages/projects/tags/releases/index.js
@@ -2,7 +2,5 @@ import $ from 'jquery';
 import GLForm from '~/gl_form';
 import ZenMode from '~/zen_mode';
 
-document.addEventListener('DOMContentLoaded', () => {
-  new ZenMode(); // eslint-disable-line no-new
-  new GLForm($('.release-form')); // eslint-disable-line no-new
-});
+new ZenMode(); // eslint-disable-line no-new
+new GLForm($('.release-form')); // eslint-disable-line no-new
diff --git a/app/controllers/concerns/comment_and_close_flag.rb b/app/controllers/concerns/comment_and_close_flag.rb
deleted file mode 100644
index 02a68d2857c..00000000000
--- a/app/controllers/concerns/comment_and_close_flag.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module CommentAndCloseFlag
-  extend ActiveSupport::Concern
-
-  included do
-    before_action do
-      push_frontend_feature_flag(:remove_comment_close_reopen, @group || @project&.group)
-    end
-  end
-end
diff --git a/app/controllers/jira_connect/subscriptions_controller.rb b/app/controllers/jira_connect/subscriptions_controller.rb
index 161280a05fc..3ff12f29f10 100644
--- a/app/controllers/jira_connect/subscriptions_controller.rb
+++ b/app/controllers/jira_connect/subscriptions_controller.rb
@@ -19,9 +19,6 @@ class JiraConnect::SubscriptionsController < JiraConnect::ApplicationController
   before_action :allow_rendering_in_iframe, only: :index
   before_action :verify_qsh_claim!, only: :index
   before_action :authenticate_user!, only: :create
-  before_action do
-    push_frontend_feature_flag(:new_jira_connect_ui, type: :development, default_enabled: :yaml)
-  end
 
   def index
     @subscriptions = current_jira_installation.subscriptions.preload_namespace_route
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 2816977277a..a02a1aaaf8b 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -9,7 +9,6 @@ class Projects::IssuesController < Projects::ApplicationController
   include IssuesCalendar
   include SpammableActions
   include RecordUserLastActivity
-  include CommentAndCloseFlag
 
   ISSUES_EXCEPT_ACTIONS = %i[index calendar new create bulk_update import_csv export_csv service_desk].freeze
   SET_ISSUEABLES_INDEX_ONLY_ACTIONS = %i[index calendar service_desk].freeze
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 6cf03cd42a6..24687672f71 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -11,7 +11,6 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
   include RecordUserLastActivity
   include SourcegraphDecorator
   include DiffHelper
-  include CommentAndCloseFlag
 
   skip_before_action :merge_request, only: [:index, :bulk_update, :export_csv]
   before_action :apply_diff_view_cookie!, only: [:show]
diff --git a/app/helpers/jira_connect_helper.rb b/app/helpers/jira_connect_helper.rb
index 080883fd594..76a7f785df6 100644
--- a/app/helpers/jira_connect_helper.rb
+++ b/app/helpers/jira_connect_helper.rb
@@ -1,13 +1,7 @@
 # frozen_string_literal: true
 
 module JiraConnectHelper
-  def new_jira_connect_ui?
-    Feature.enabled?(:new_jira_connect_ui, type: :development, default_enabled: :yaml)
-  end
-
   def jira_connect_app_data(subscriptions)
-    return {} unless new_jira_connect_ui?
-
     skip_groups = subscriptions.map(&:namespace_id)
 
     {
diff --git a/app/services/packages/create_event_service.rb b/app/services/packages/create_event_service.rb
index 63248ef07c9..8fed6e2def8 100644
--- a/app/services/packages/create_event_service.rb
+++ b/app/services/packages/create_event_service.rb
@@ -3,14 +3,12 @@
 module Packages
   class CreateEventService < BaseService
     def execute
-      if Feature.enabled?(:collect_package_events_redis, default_enabled: true)
-        ::Packages::Event.unique_counters_for(event_scope, event_name, originator_type).each do |event_name|
-          ::Gitlab::UsageDataCounters::HLLRedisCounter.track_event(event_name, values: current_user.id)
-        end
-
-        ::Packages::Event.counters_for(event_scope, event_name, originator_type).each do |event_name|
-          ::Gitlab::UsageDataCounters::PackageEventCounter.count(event_name)
-        end
+      ::Packages::Event.unique_counters_for(event_scope, event_name, originator_type).each do |event_name|
+        ::Gitlab::UsageDataCounters::HLLRedisCounter.track_event(event_name, values: current_user.id)
+      end
+
+      ::Packages::Event.counters_for(event_scope, event_name, originator_type).each do |event_name|
+        ::Gitlab::UsageDataCounters::PackageEventCounter.count(event_name)
       end
 
       if Feature.enabled?(:collect_package_events) && Gitlab::Database.read_write?
diff --git a/app/views/jira_connect/subscriptions/index.html.haml b/app/views/jira_connect/subscriptions/index.html.haml
index 6a549227185..c7873991010 100644
--- a/app/views/jira_connect/subscriptions/index.html.haml
+++ b/app/views/jira_connect/subscriptions/index.html.haml
@@ -15,8 +15,7 @@
       %p= s_('JiraService|Sign in to GitLab.com to get started.')
 
       .gl-mt-7
-        - sign_in_button_class = new_jira_connect_ui? ? 'btn gl-button btn-confirm' : 'ak-button ak-button__appearance-primary'
-        = external_link _('Sign in to GitLab'), jira_connect_users_path, class: "#{sign_in_button_class} js-jira-connect-sign-in"
+        = external_link _('Sign in to GitLab'), jira_connect_users_path, class: "btn gl-button btn-confirm js-jira-connect-sign-in"
 
       .gl-mt-7
         %p= s_('Integrations|Note: this integration only works with accounts on GitLab.com (SaaS).')
@@ -24,16 +23,6 @@
     .js-jira-connect-app{ data: jira_connect_app_data(@subscriptions) }
 
     .jira-connect-app-body
-      - unless new_jira_connect_ui?
-        %form#add-subscription-form.subscription-form.gl-mb-5{ action: jira_connect_subscriptions_path }
-          .ak-field-group
-            %label= _('GitLab namespace')
-
-          .ak-field-group.field-group-input
-            %input#namespace-input.ak-field-text{ type: 'text', required: true, placeholder: 'e.g. "MyCompany" or "MyCompany/GroupName"' }
-            %button.ak-button.ak-button__appearance-primary{ type: 'submit' }
-              = s_('Integrations|Link namespace to Jira')
-
       - if @subscriptions.present?
         %table.subscriptions.gl-w-full
           %thead
diff --git a/app/views/layouts/jira_connect.html.haml b/app/views/layouts/jira_connect.html.haml
index e9da940ca7a..6acd7799875 100644
--- a/app/views/layouts/jira_connect.html.haml
+++ b/app/views/layouts/jira_connect.html.haml
@@ -3,9 +3,6 @@
     %meta{ content: "text/html; charset=utf-8", "http-equiv" => "Content-Type" }
     %title
       GitLab
-    - unless new_jira_connect_ui?
-      = stylesheet_link_tag 'https://unpkg.com/@atlaskit/css-reset@3.0.6/dist/bundle.css'
-      = stylesheet_link_tag 'https://unpkg.com/@atlaskit/reduced-ui-pack@10.5.5/dist/bundle.css'
     = yield :page_specific_styles
 
     = javascript_include_tag 'https://connect-cdn.atl-paas.net/all.js'