diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-17 14:17:32 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-18 17:47:52 +0300 |
| commit | e940fbc7c1b322c15f5d5ae878fbd3117e9b98f9 (patch) | |
| tree | 385370e2caea4e562a563613581cc64258e5b9e0 /app/controllers/groups_controller.rb | |
| parent | fa877b63126c84cb304228cf37b61d186d5e4477 (diff) | |
| download | gitlab-ce-e940fbc7c1b322c15f5d5ae878fbd3117e9b98f9.tar.gz | |
Add UsersGroup relation to be respected by abilities and Project#team
Diffstat (limited to 'app/controllers/groups_controller.rb')
| -rw-r--r-- | app/controllers/groups_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 9cbe6ec44f2..a191aff2b6b 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -64,11 +64,11 @@ class GroupsController < ApplicationController def people @project = group.projects.find(params[:project_id]) if params[:project_id] - @users_groups = group.users_groups - if @project + @members = @project.users_projects @team_member = @project.users_projects.new else + @members = group.users_groups @team_member = UsersGroup.new end end |