From 7a7ce701692d4048a7f5ab2767aa30a8f5eb05c8 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Tue, 19 May 2015 20:46:48 -0700
Subject: Use the user list from the target project in a merge request

Closes #1535
---
 app/helpers/selects_helper.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'app/helpers')

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
-- 
cgit v1.2.3