Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.rubocop_manual_todo.yml

@@ -16,8 +16,6 @@ FactoryBot/InlineAssociation:
     - 'spec/factories/import_export_uploads.rb'
     - 'spec/factories/merge_requests.rb'
     - 'spec/factories/notes.rb'
-    - 'spec/factories/packages.rb'
-    - 'spec/factories/packages/package_file.rb'
     - 'spec/factories/sent_notifications.rb'
     - 'spec/factories/uploads.rb'
     - 'spec/factories/wiki_pages.rb'

GITALY_SERVER_VERSION

@@ -1 +1 @@
-194a9f58926793ade53152de90b474d66804e21e
+506c44cc07dcb804ce970ec1c02bb6e0d52320d8

app/assets/javascripts/vue_shared/components/dropdown/dropdown_button.vue

@@ -1,10 +1,11 @@
 <script>
-import { GlLoadingIcon } from '@gitlab/ui';
+import { GlLoadingIcon, GlIcon } from '@gitlab/ui';
 import { __ } from '~/locale';
 
 export default {
   components: {
     GlLoadingIcon,
+    GlIcon,
   },
   props: {
     isDisabled: {
@@ -39,8 +40,10 @@ export default {
       <slot v-if="$slots.default"></slot>
       <span v-else class="dropdown-toggle-text"> {{ toggleText }} </span>
     </template>
-    <span v-show="!isLoading" class="dropdown-toggle-icon">
-      <i class="fa fa-chevron-down" aria-hidden="true" data-hidden="true"></i>
-    </span>
+    <gl-icon
+      v-show="!isLoading"
+      class="gl-absolute gl-top-3 gl-right-3 gl-text-gray-500"
+      name="chevron-down"
+    />
   </button>
 </template>

app/controllers/application_controller.rb

@@ -266,6 +266,12 @@ def no_cache_headers
     end
   end
 
+  def stream_headers
+    headers['Content-Length'] = nil
+    headers['X-Accel-Buffering'] = 'no' # Disable buffering on Nginx
+    headers['Last-Modified'] = '0' # Prevent buffering via Rack::ETag middleware
+  end
+
   def default_headers
     headers['X-Frame-Options'] = 'DENY'
     headers['X-XSS-Protection'] = '1; mode=block'

app/controllers/registrations_controller.rb

@@ -3,7 +3,7 @@
 class RegistrationsController < Devise::RegistrationsController
   include Recaptcha::Verify
   include AcceptsPendingInvitations
-  include RecaptchaExperimentHelper
+  include RecaptchaHelper
   include InvisibleCaptchaOnSignup
 
   BLOCKED_PENDING_APPROVAL_STATE = 'blocked_pending_approval'.freeze
@@ -176,5 +176,3 @@ def set_invite_params
     @invite_email = ActionController::Base.helpers.sanitize(params[:invite_email])
   end
 end
-
-RegistrationsController.prepend_if_ee('EE::RegistrationsController')

app/helpers/recaptcha_experiment_helper.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module RecaptchaHelper
+  def show_recaptcha_sign_up?
+    !!Gitlab::Recaptcha.enabled?
+  end
+end

app/helpers/recaptcha_helper.rb

@@ -5,8 +5,6 @@ class ReopenService < Issues::BaseService
     def execute(issue)
       return issue unless can?(current_user, :reopen_issue, issue)
 
-      before_reopen(issue)
-
       if issue.reopen
         event_service.reopen_issue(issue, current_user)
         create_note(issue, 'reopened')
@@ -23,14 +21,8 @@ def execute(issue)
 
     private
 
-    def before_reopen(issue)
-      # Overriden in EE
-    end
-
     def create_note(issue, state = issue.state)
       SystemNoteService.change_status(issue, issue.project, current_user, state, nil)
     end
   end
 end
-
-Issues::ReopenService.prepend_if_ee('EE::Issues::ReopenService')

app/services/issues/reopen_service.rb

@@ -4,7 +4,7 @@ module JiraConnectSubscriptions
   class CreateService < ::JiraConnectSubscriptions::BaseService
     include Gitlab::Utils::StrongMemoize
     MERGE_REQUEST_SYNC_BATCH_SIZE = 20
-    MERGE_REQUEST_SYNC_BATCH_delay = 1.minute.freeze
+    MERGE_REQUEST_SYNC_BATCH_DELAY = 1.minute.freeze
 
     def execute
       unless namespace && can?(current_user, :create_jira_connect_subscription, namespace)
@@ -39,7 +39,7 @@ def schedule_sync_project_jobs
 
       namespace.all_projects.each_batch(of: MERGE_REQUEST_SYNC_BATCH_SIZE) do |projects, index|
         JiraConnect::SyncProjectWorker.bulk_perform_in_with_contexts(
-          index * MERGE_REQUEST_SYNC_BATCH_delay,
+          index * MERGE_REQUEST_SYNC_BATCH_DELAY,
           projects,
           arguments_proc: -> (project) { [project.id, Atlassian::JiraConnect::Client.generate_update_sequence_id] },
           context_proc: -> (project) { { project: project } }

app/services/jira_connect_subscriptions/create_service.rb

@@ -3,7 +3,7 @@
   .settings-header
     %h4
       = _('Amazon EKS')
-    %button.btn.js-settings-toggle{ type: 'button' }
+    %button.btn.gl-button.js-settings-toggle{ type: 'button' }
       = expanded ? 'Collapse' : 'Expand'
     %p
       = _('Amazon EKS integration allows you to provision EKS clusters from GitLab.')