diff options
author | Jose Ivan Vargas <jvargas@gitlab.com> | 2016-12-26 10:12:24 -0600 |
---|---|---|
committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-01-03 10:52:14 -0600 |
commit | 57b5612aaa6fd243f18587acbf0a8ebbb37551f2 (patch) | |
tree | e3353bacabf62f5b086d22e5319cdc15d957fd51 /app/controllers/projects/settings | |
parent | ad58dec2e1564e9c2d23dd32e5da8b12eeba965d (diff) | |
download | gitlab-ce-57b5612aaa6fd243f18587acbf0a8ebbb37551f2.tar.gz |
Removed the "Groups" option from the settings gear
Fixed more tests
Diffstat (limited to 'app/controllers/projects/settings')
-rw-r--r-- | app/controllers/projects/settings/members_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/settings/members_controller.rb b/app/controllers/projects/settings/members_controller.rb index 766a01ba5e1..5735e281f66 100644 --- a/app/controllers/projects/settings/members_controller.rb +++ b/app/controllers/projects/settings/members_controller.rb @@ -16,14 +16,14 @@ module Projects @group_links = @project.project_group_links.all @skip_groups = @group_links.pluck(:group_id) - @skip_groups << @project.namespace_id unless project.personal? + @skip_groups << @project.namespace_id unless @project.personal? if group # We need `.where.not(user_id: nil)` here otherwise when a group has an # invitee, it would make the following query return 0 rows since a NULL # user_id would be present in the subquery # See http://stackoverflow.com/questions/129077/not-in-clause-and-null-values - group_members = MembersFinder.new(@project, @group) + group_members = MembersFinder.new(@project_members, group).execute(current_user) end if params[:search].present? |