summaryrefslogtreecommitdiff
path: root/app/helpers/selects_helper.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-13 15:07:53 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-13 15:07:53 +0000
commita5ab3467a705b62911feacc3cf627fdbb00aa198 (patch)
tree65143ce13405efccb922fc428624ad57c38b6efa /app/helpers/selects_helper.rb
parenteb30dd6e28f6fc9eb8021d205f6ed84511f001e2 (diff)
downloadgitlab-ce-a5ab3467a705b62911feacc3cf627fdbb00aa198.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/selects_helper.rb')
-rw-r--r--app/helpers/selects_helper.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/selects_helper.rb b/app/helpers/selects_helper.rb
index 90c54123597..4d0f9e530fb 100644
--- a/app/helpers/selects_helper.rb
+++ b/app/helpers/selects_helper.rb
@@ -85,7 +85,8 @@ module SelectsHelper
first_user: opts[:first_user] && current_user ? current_user.username : false,
current_user: opts[:current_user] || false,
author_id: opts[:author_id] || '',
- skip_users: opts[:skip_users] ? opts[:skip_users].map(&:id) : nil
+ skip_users: opts[:skip_users] ? opts[:skip_users].map(&:id) : nil,
+ qa_selector: opts[:qa_selector] || ''
}
end
end