Add latest changes from gitlab-org/gitlab@master

1 files changed, 24 insertions, 2 deletions

diff --git a/app/helpers/form_helper.rb b/app/helpers/form_helper.rb
index 3dde5afcb92..8a8d708b0b2 100644
--- a/app/helpers/form_helper.rb
+++ b/app/helpers/form_helper.rb
@@ -56,7 +56,7 @@ module FormHelper
   end
 
   def reviewers_dropdown_options(issuable_type)
-    {
+    dropdown_data = {
       toggle_class: 'js-reviewer-search js-multiselect js-save-user-data',
       title: 'Request review from',
       filter: true,
@@ -69,13 +69,20 @@ module FormHelper
         project_id: (@target_project || @project)&.id,
         field_name: "#{issuable_type}[reviewer_ids][]",
         default_label: 'Unassigned',
-        'dropdown-header': 'Reviewer(s)',
+        'max-select': 1,
+        'dropdown-header': 'Reviewer',
         multi_select: true,
         'input-meta': 'name',
         'always-show-selectbox': true,
         current_user_info: UserSerializer.new.represent(current_user)
       }
     }
+
+    if merge_request_supports_multiple_reviewers?
+      dropdown_data = multiple_reviewers_dropdown_options(dropdown_data)
+    end
+
+    dropdown_data
   end
 
   # Overwritten
@@ -88,6 +95,11 @@ module FormHelper
     false
   end
 
+  # Overwritten
+  def merge_request_supports_multiple_reviewers?
+    false
+  end
+
   private
 
   def multiple_assignees_dropdown_options(options)
@@ -99,6 +111,16 @@ module FormHelper
 
     new_options
   end
+
+  def multiple_reviewers_dropdown_options(options)
+    new_options = options.dup
+
+    new_options[:title] = _('Select reviewer(s)')
+    new_options[:data][:'dropdown-header'] = _('Reviewer(s)')
+    new_options[:data].delete(:'max-select')
+
+    new_options
+  end
 end
 
 FormHelper.prepend_if_ee('::EE::FormHelper')