Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue

@@ -12,7 +12,7 @@ export default {
   <div class="mr-widget-body media">
     <status-icon :show-disabled-button="true" status="loading" />
     <div class="media-body space-children">
-      <span class="bold"> {{ s__('mrWidget|Checking ability to merge automatically') }} </span>
+      <span class="bold"> {{ s__('mrWidget|Checking ability to merge automatically…') }} </span>
     </div>
   </div>
 </template>

app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js

@@ -7,7 +7,7 @@ export default function deviseState(data) {
     return stateKey.missingBranch;
   } else if (!data.commits_count) {
     return stateKey.nothingToMerge;
-  } else if (this.mergeStatus === 'unchecked') {
+  } else if (this.mergeStatus === 'unchecked' || this.mergeStatus === 'checking') {
     return stateKey.checking;
   } else if (data.has_conflicts) {
     return stateKey.conflicts;

app/controllers/projects/merge_requests_controller.rb

@@ -45,7 +45,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
   def show
     close_merge_request_if_no_source_project
-    @merge_request.check_mergeability
+    @merge_request.check_mergeability(async: true)
     respond_to do |format|
       format.html do

app/helpers/milestones_helper.rb

@@ -26,7 +26,7 @@ module MilestonesHelper
     end
   end
-  def milestones_label_path(opts = {})
+  def milestones_issues_path(opts = {})
     if @project
       project_issues_path(@project, opts)
     elsif @group
@@ -281,6 +281,26 @@ module MilestonesHelper
       can?(current_user, :admin_milestone, @project.group)
     end
   end
+
+  def display_issues_count_warning?
+    milestone_visible_issues_count > Milestone::DISPLAY_ISSUES_LIMIT
+  end
+
+  def milestone_issues_count_message
+    total_count = milestone_visible_issues_count
+    limit = Milestone::DISPLAY_ISSUES_LIMIT
+
+    message = _('Showing %{limit} of %{total_count} issues. ') % { limit: limit, total_count: total_count }
+    message += link_to(_('View all issues'), milestones_issues_path)
+
+    message.html_safe
+  end
+
+  private
+
+  def milestone_visible_issues_count
+    @milestone_visible_issues_count ||= @milestone.issues_visible_to_user(current_user).size
+  end
 end
 MilestonesHelper.prepend_if_ee('EE::MilestonesHelper')

app/models/concerns/milestoneish.rb

 # frozen_string_literal: true
 module Milestoneish
+  DISPLAY_ISSUES_LIMIT = 20
+
   def total_issues_count(user)
     count_issues_by_state(user).values.sum
   end
@@ -53,7 +55,11 @@ module Milestoneish
   end
   def sorted_issues(user)
-    issues_visible_to_user(user).preload_associated_models.sort_by_attribute('label_priority')
+    # This method is used on milestone view to filter opened assigned, opened unassigned and closed issues columns.
+    # We want a limit of DISPLAY_ISSUES_LIMIT for total issues present on all columns.
+    limited_ids = issues_visible_to_user(user).limit(DISPLAY_ISSUES_LIMIT).select(:id)
+
+    Issue.where(id: limited_ids).preload_associated_models.sort_by_attribute('label_priority')
   end
   def sorted_merge_requests(user)

app/models/merge_request.rb

@@ -160,20 +160,25 @@ class MergeRequest < ApplicationRecord
   state_machine :merge_status, initial: :unchecked do
     event :mark_as_unchecked do
-      transition [:can_be_merged, :unchecked] => :unchecked
+      transition [:can_be_merged, :checking, :unchecked] => :unchecked
       transition [:cannot_be_merged, :cannot_be_merged_recheck] => :cannot_be_merged_recheck
     end
+    event :mark_as_checking do
+      transition [:unchecked, :cannot_be_merged_recheck] => :checking
+    end
+
     event :mark_as_mergeable do
-      transition [:unchecked, :cannot_be_merged_recheck] => :can_be_merged
+      transition [:unchecked, :cannot_be_merged_recheck, :checking] => :can_be_merged
     end
     event :mark_as_unmergeable do
-      transition [:unchecked, :cannot_be_merged_recheck] => :cannot_be_merged
+      transition [:unchecked, :cannot_be_merged_recheck, :checking] => :cannot_be_merged
     end
     state :unchecked
     state :cannot_be_merged_recheck
+    state :checking
     state :can_be_merged
     state :cannot_be_merged
@@ -191,7 +196,7 @@ class MergeRequest < ApplicationRecord
     # rubocop: enable CodeReuse/ServiceClass
     def check_state?(merge_status)
-      [:unchecked, :cannot_be_merged_recheck].include?(merge_status.to_sym)
+      [:unchecked, :cannot_be_merged_recheck, :checking].include?(merge_status.to_sym)
     end
   end
@@ -812,10 +817,16 @@ class MergeRequest < ApplicationRecord
     MergeRequests::ReloadDiffsService.new(self, current_user).execute
   end
-  def check_mergeability
+  def check_mergeability(async: false)
     return if Feature.enabled?(:merge_requests_conditional_mergeability_check, default_enabled: true) && !recheck_merge_status?
-    MergeRequests::MergeabilityCheckService.new(self).execute(retry_lease: false)
+    check_service = MergeRequests::MergeabilityCheckService.new(self)
+
+    if async && Feature.enabled?(:async_merge_request_check_mergeability, project)
+      check_service.async_execute
+    else
+      check_service.execute(retry_lease: false)
+    end
   end
   # rubocop: enable CodeReuse/ServiceClass

app/services/concerns/akismet_methods.rb

@@ -2,16 +2,7 @@
 module AkismetMethods
   def spammable_owner
-    @user ||= User.find(spammable_owner_id)
-  end
-
-  def spammable_owner_id
-    @owner_id ||=
-      if spammable.respond_to?(:author_id)
-        spammable.author_id
-      elsif spammable.respond_to?(:creator_id)
-        spammable.creator_id
-      end
+    @user ||= User.find(spammable.author_id)
   end
   def akismet

app/services/merge_requests/mergeability_check_service.rb

@@ -12,6 +12,13 @@ module MergeRequests
       @merge_request = merge_request
     end
+    def async_execute
+      return service_error if service_error
+      return unless merge_request.mark_as_checking
+
+      MergeRequestMergeabilityCheckWorker.perform_async(merge_request.id)
+    end
+
     # Updates the MR merge_status. Whenever it switches to a can_be_merged state,
     # the merge-ref is refreshed.
     #
@@ -30,8 +37,7 @@ module MergeRequests
     # and the merge-ref is synced. Success in case of being/becoming mergeable,
     # error otherwise.
     def execute(recheck: false, retry_lease: true)
-      return ServiceResponse.error(message: 'Invalid argument') unless merge_request
-      return ServiceResponse.error(message: 'Unsupported operation') if Gitlab::Database.read_only?
+      return service_error if service_error
       return check_mergeability(recheck) unless merge_ref_auto_sync_lock_enabled?
       in_write_lock(retry_lease: retry_lease) do |retried|
@@ -155,5 +161,15 @@ module MergeRequests
     def merge_ref_auto_sync_lock_enabled?
       Feature.enabled?(:merge_ref_auto_sync_lock, project, default_enabled: true)
     end
+
+    def service_error
+      strong_memoize(:service_error) do
+        if !merge_request
+          ServiceResponse.error(message: 'Invalid argument')
+        elsif Gitlab::Database.read_only?
+          ServiceResponse.error(message: 'Unsupported operation')
+        end
+      end
+    end
   end
 end

app/services/pages_domains/create_acme_order_service.rb

@@ -3,9 +3,6 @@
 module PagesDomains
   class CreateAcmeOrderService
     attr_reader :pages_domain
-    # TODO: remove this hack after https://gitlab.com/gitlab-org/gitlab/issues/30146 is implemented
-    # This makes GitLab automatically retry the certificate obtaining process every 2 hours if process wasn't finished
-    SHORT_EXPIRATION_DELAY = 2.hours
     def initialize(pages_domain)
       @pages_domain = pages_domain
@@ -20,7 +17,7 @@ module PagesDomains
       private_key = OpenSSL::PKey::RSA.new(4096)
       saved_order = pages_domain.acme_orders.create!(
         url: order.url,
-        expires_at: [order.expires, SHORT_EXPIRATION_DELAY.from_now].min,
+        expires_at: order.expires,
         private_key: private_key.to_pem,
         challenge_token: challenge.token,

app/services/spam_service.rb

@@ -53,7 +53,7 @@ class SpamService
   def create_spam_log(api)
     @spam_log = SpamLog.create!(
       {
-        user_id: spammable_owner_id,
+        user_id: spammable.author_id,
         title: spammable.spam_title,
         description: spammable.spam_description,
         source_ip: options[:ip_address],

app/views/layouts/nav/_dashboard.html.haml

@@ -76,7 +76,7 @@
   - if Feature.enabled?(:user_mode_in_session)
     - if header_link?(:admin_mode)
       = nav_link(controller: 'admin/sessions', html_options: { class: "d-none d-lg-block d-xl-block"}) do
-        = link_to destroy_admin_session_path, title: _('Leave Admin Mode'), aria: { label: _('Leave Admin Mode') }, data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } do
+        = link_to destroy_admin_session_path, method: :post, title: _('Leave Admin Mode'), aria: { label: _('Leave Admin Mode') }, data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } do
           = sprite_icon('lock-open', size: 18)
     - elsif current_user.admin?
       = nav_link(controller: 'admin/sessions', html_options: { class: "d-none d-lg-block d-xl-block"}) do

app/views/shared/_auto_devops_implicitly_enabled_banner.html.haml

@@ -10,4 +10,4 @@
     - unless Gitlab.config.registry.enabled
       %div
         = icon('exclamation-triangle')
-        = _('Container registry is not enabled on this GitLab instance. Ask an administrator to enable it in order for AutoDevOps to work.')
+        = _('Container registry is not enabled on this GitLab instance. Ask an administrator to enable it in order for Auto DevOps to work.')

app/views/shared/milestones/_issues_tab.html.haml

 - args = { show_project_name: local_assigns.fetch(:show_project_name, false),
            show_full_project_name: local_assigns.fetch(:show_full_project_name, false) }
+- if display_issues_count_warning?
+  .flash-container
+    .flash-warning#milestone-issue-count-warning
+      = milestone_issues_count_message
+
 .row.prepend-top-default
   .col-md-4
     = render 'shared/milestones/issuables', args.merge(title: 'Unstarted Issues (open and unassigned)', issuables: issues.opened.unassigned, id: 'unassigned', show_counter: true)

app/views/shared/milestones/_labels_tab.html.haml

@@ -5,12 +5,12 @@
     %li.no-border
       %span.label-row
         %span.label-name
-          = render_label(label, tooltip: false, link: milestones_label_path(options))
+          = render_label(label, tooltip: false, link: milestones_issues_path(options))
         %span.prepend-description-left
           = markdown_field(label, :description)
       .float-right.d-none.d-lg-block.d-xl-block
-        = link_to milestones_label_path(options.merge(state: 'opened')), class: 'btn btn-transparent btn-action' do
+        = link_to milestones_issues_path(options.merge(state: 'opened')), class: 'btn btn-transparent btn-action' do
           - pluralize milestone_issues_by_label_count(@milestone, label, state: :opened), 'open issue'
-        = link_to milestones_label_path(options.merge(state: 'closed')), class: 'btn btn-transparent btn-action' do
+        = link_to milestones_issues_path(options.merge(state: 'closed')), class: 'btn btn-transparent btn-action' do
           - pluralize milestone_issues_by_label_count(@milestone, label, state: :closed), 'closed issue'

app/workers/all_queues.yml

@@ -191,3 +191,4 @@
 - group_export
 - self_monitoring_project_create
 - self_monitoring_project_delete
+- merge_request_mergeability_check

app/workers/merge_request_mergeability_check_worker.rb

+# frozen_string_literal: true
+
+class MergeRequestMergeabilityCheckWorker
+  include ApplicationWorker
+
+  feature_category :source_code_management
+
+  def perform(merge_request_id)
+    merge_request = MergeRequest.find_by_id(merge_request_id)
+
+    unless merge_request
+      logger.error("Failed to find merge request with ID: #{merge_request_id}")
+      return
+    end
+
+    result =
+      ::MergeRequests::MergeabilityCheckService
+        .new(merge_request)
+        .execute(recheck: false, retry_lease: false)
+
+    logger.error("Failed to check mergeability of merge request (#{merge_request_id}): #{result.message}") if result.error?
+  end
+end

changelogs/unreleased/29984-asynchronous-mr-mergeability-check.yml

+---
+title: Check mergeability of MR asynchronously
+merge_request: 21026
+author:
+type: performance

changelogs/unreleased/acme-order-short-expiration.yml

----
-title: Retry obtaining Let's Encrypt certificates every 2 hours if it wasn't successful
-merge_request: 22336
-author:
-type: fixed

changelogs/unreleased/fix-disable-admin-mode-link-in-dashboard.yml

+---
+title: Fix POST method in dashboard link for disabling admin mode
+merge_request: 23363
+author: Diego Louzán
+type: fixed

changelogs/unreleased/issue_39453.yml

+---
+title: Limits issues displayed on milestones
+merge_request: 23102
+author:
+type: performance