diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 00:09:57 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 00:09:57 +0300 |
commit | c47247f7cd8272d2cdc9f472d00a2542724ee95e (patch) | |
tree | e9ac337538065497f62f7b71e3d4a8962049045d /app/helpers/form_helper.rb | |
parent | d755061465c24de58568183df5e7b826e934ae5d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/form_helper.rb')
-rw-r--r-- | app/helpers/form_helper.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/helpers/form_helper.rb b/app/helpers/form_helper.rb index 8a8d708b0b2..d0276c91316 100644 --- a/app/helpers/form_helper.rb +++ b/app/helpers/form_helper.rb @@ -55,7 +55,7 @@ module FormHelper dropdown_data end - def reviewers_dropdown_options(issuable_type) + def reviewers_dropdown_options(issuable_type, iid = nil, target_branch = nil) dropdown_data = { toggle_class: 'js-reviewer-search js-multiselect js-save-user-data', title: 'Request review from', @@ -78,6 +78,14 @@ module FormHelper } } + if iid + dropdown_data[:data][:iid] = iid + end + + if target_branch + dropdown_data[:data][:target_branch] = target_branch + end + if merge_request_supports_multiple_reviewers? dropdown_data = multiple_reviewers_dropdown_options(dropdown_data) end |