diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-05-19 20:46:48 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-05-22 09:52:09 -0400 |
| commit | 7a7ce701692d4048a7f5ab2767aa30a8f5eb05c8 (patch) | |
| tree | 20b4bf58667c30bf3c0ccf848bab19325fd6877b /app/helpers/selects_helper.rb | |
| parent | 2b1b026a1e8c7654b475aa0aaacf3121e86ee2a5 (diff) | |
| download | gitlab-ce-7a7ce701692d4048a7f5ab2767aa30a8f5eb05c8.tar.gz | |
Use the user list from the target project in a merge request
Closes #1535
Diffstat (limited to 'app/helpers/selects_helper.rb')
| -rw-r--r-- | app/helpers/selects_helper.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/helpers/selects_helper.rb b/app/helpers/selects_helper.rb index bec8f2f1aa7..2b99a398049 100644 --- a/app/helpers/selects_helper.rb +++ b/app/helpers/selects_helper.rb @@ -10,6 +10,7 @@ module SelectsHelper any_user = opts[:any_user] || false email_user = opts[:email_user] || false first_user = opts[:first_user] && current_user ? current_user.username : false + project = opts[:project] || @project html = { class: css_class, @@ -21,8 +22,8 @@ module SelectsHelper } unless opts[:scope] == :all - if @project - html['data-project-id'] = @project.id + if project + html['data-project-id'] = project.id elsif @group html['data-group-id'] = @group.id end |