diff options
Diffstat (limited to 'app/helpers/form_helper.rb')
| -rw-r--r-- | app/helpers/form_helper.rb | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/app/helpers/form_helper.rb b/app/helpers/form_helper.rb index 8f0d01c7d6d..a4d90716129 100644 --- a/app/helpers/form_helper.rb +++ b/app/helpers/form_helper.rb @@ -45,9 +45,7 @@ module FormHelper end end - def dropdown_max_select(data, feature_flag) - return data[:'max-select'] unless feature_flag.nil? || Feature.enabled?(feature_flag) - + def dropdown_max_select(data) if data[:'max-select'] && data[:'max-select'] < ::Issuable::MAX_NUMBER_OF_ASSIGNEES_OR_REVIEWERS data[:'max-select'] else @@ -179,11 +177,7 @@ module FormHelper new_options[:title] = _('Select reviewer(s)') new_options[:data][:'dropdown-header'] = _('Reviewer(s)') - if Feature.enabled?(:limit_reviewer_and_assignee_size) - new_options[:data][:'max-select'] = ::Issuable::MAX_NUMBER_OF_ASSIGNEES_OR_REVIEWERS - else - new_options[:data].delete(:'max-select') - end + new_options[:data][:'max-select'] = ::Issuable::MAX_NUMBER_OF_ASSIGNEES_OR_REVIEWERS new_options end |