diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 09:40:42 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 09:40:42 +0000 |
commit | ee664acb356f8123f4f6b00b73c1e1cf0866c7fb (patch) | |
tree | f8479f94a28f66654c6a4f6fb99bad6b4e86a40e /app/helpers/form_helper.rb | |
parent | 62f7d5c5b69180e82ae8196b7b429eeffc8e7b4f (diff) | |
download | gitlab-ce-ee664acb356f8123f4f6b00b73c1e1cf0866c7fb.tar.gz |
Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42
Diffstat (limited to 'app/helpers/form_helper.rb')
-rw-r--r-- | app/helpers/form_helper.rb | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/app/helpers/form_helper.rb b/app/helpers/form_helper.rb index f2e24f54391..9e42aeea9ce 100644 --- a/app/helpers/form_helper.rb +++ b/app/helpers/form_helper.rb @@ -39,13 +39,13 @@ module FormHelper end end - def dropdown_max_select(data) - return data[:'max-select'] unless Feature.enabled?(:limit_reviewer_and_assignee_size) + def dropdown_max_select(data, feature_flag) + return data[:'max-select'] unless Feature.enabled?(feature_flag) - if data[:'max-select'] && data[:'max-select'] < MergeRequest::MAX_NUMBER_OF_ASSIGNEES_OR_REVIEWERS + if data[:'max-select'] && data[:'max-select'] < ::Issuable::MAX_NUMBER_OF_ASSIGNEES_OR_REVIEWERS data[:'max-select'] else - MergeRequest::MAX_NUMBER_OF_ASSIGNEES_OR_REVIEWERS + ::Issuable::MAX_NUMBER_OF_ASSIGNEES_OR_REVIEWERS end end @@ -117,10 +117,16 @@ module FormHelper dropdown_data = multiple_reviewers_dropdown_options(dropdown_data) end + dropdown_data[:data].merge!(reviewers_dropdown_options_for_suggested_reviewers) dropdown_data end # Overwritten + def reviewers_dropdown_options_for_suggested_reviewers + {} + end + + # Overwritten def issue_supports_multiple_assignees? false end @@ -156,7 +162,12 @@ module FormHelper new_options[:title] = _('Select assignee(s)') new_options[:data][:'dropdown-header'] = 'Assignee(s)' - new_options[:data].delete(:'max-select') + + if Feature.enabled?(:limit_assignees_per_issuable) + new_options[:data][:'max-select'] = ::Issuable::MAX_NUMBER_OF_ASSIGNEES_OR_REVIEWERS + else + new_options[:data].delete(:'max-select') + end new_options end @@ -168,7 +179,7 @@ module FormHelper new_options[:data][:'dropdown-header'] = _('Reviewer(s)') if Feature.enabled?(:limit_reviewer_and_assignee_size) - new_options[:data][:'max-select'] = MergeRequest::MAX_NUMBER_OF_ASSIGNEES_OR_REVIEWERS + new_options[:data][:'max-select'] = ::Issuable::MAX_NUMBER_OF_ASSIGNEES_OR_REVIEWERS else new_options[:data].delete(:'max-select') end |