Merge branch '244835-update-mr-form-to-use-plural-field-names' into 'master'

Update MR form to use plural field names

See merge request gitlab-org/gitlab!41402

app/views/shared/issuable/form/_metadata_issuable_assignee.html.haml

-= form.label :assignee_id, "Assignee", class: "col-form-label #{has_due_date ? "col-md-2 col-lg-4" : "col-sm-2"}"
+= form.label :assignee_id, issuable.allows_multiple_assignees? ? _('Assignees') : _('Assignee'), class: "col-form-label #{has_due_date ? "col-md-2 col-lg-4" : "col-sm-2"}"
 .col-sm-10{ class: ("col-md-8" if has_due_date) }
   .issuable-form-select-holder.selectbox
     - issuable.assignees.each do |assignee|

app/views/shared/issuable/form/_metadata_issuable_reviewer.html.haml

-= form.label :reviewer_id, "Reviewer", class: "col-form-label #{has_due_date ? "col-md-2 col-lg-4" : "col-sm-2"}"
+= form.label :reviewer_id, issuable.allows_multiple_reviewers? ? _('Reviewers') : _('Reviewer'), class: "col-form-label #{has_due_date ? "col-md-2 col-lg-4" : "col-sm-2"}"
 .col-sm-10{ class: ("col-md-8" if has_due_date) }
   .issuable-form-select-holder.selectbox
     - issuable.reviewers.each do |reviewer|

ee/changelogs/unreleased/244835-update-mr-form-to-use-plural-field-names.yml

+---
+title: Resolve Update MR form to use plural field names
+merge_request: 41402
+author:
+type: changed

ee/spec/features/issues/user_edits_issue_spec.rb

+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe "Issues > User edits issue", :js do
+  let!(:project)   { create(:project) }
+  let!(:user)      { create(:user)}
+  let!(:milestone) { create(:milestone, project: project) }
+  let!(:label)     { create(:label, project: project) }
+  let!(:issue)     { create(:issue, project: project, assignees: [user], milestone: milestone) }
+
+  context 'with multiple_issue_assignees' do
+    it 'displays plural Assignees title' do
+      stub_licensed_features(multiple_issue_assignees: true)
+      project.add_maintainer(user)
+      sign_in(user)
+      visit edit_project_issue_path(project, issue)
+      expect(page).to have_content "Assignees"
+    end
+  end
+end

locale/gitlab.pot

@@ -23420,6 +23420,9 @@ msgstr[1] ""
 msgid "Reviewer(s)"
 msgstr ""
 
+msgid "Reviewers"
+msgstr ""
+
 msgid "Reviewing"
 msgstr ""
 

spec/features/issues/user_edits_issue_spec.rb

@@ -22,6 +22,7 @@ RSpec.describe "Issues > User edits issue", :js do
 
     context "from edit page" do
       before do
+        stub_licensed_features(multiple_issue_assignees: false)
         visit edit_project_issue_path(project, issue)
       end