Skip to content
Snippets Groups Projects

Moved the members and groups to single option called members

Merged Jose Ivan Vargas requested to merge 25985-combine-members-and-groups-settings-pages into master
6 files
+ 13
11
Compare changes
  • Side-by-side
  • Inline
Files
6
@@ -16,14 +16,14 @@ def show
@@ -16,14 +16,14 @@ def show
@group_links = @project.project_group_links.all
@group_links = @project.project_group_links.all
@skip_groups = @group_links.pluck(:group_id)
@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
if group
# We need `.where.not(user_id: nil)` here otherwise when a group has an
# 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
# invitee, it would make the following query return 0 rows since a NULL
# user_id would be present in the subquery
# user_id would be present in the subquery
# See http://stackoverflow.com/questions/129077/not-in-clause-and-null-values
# 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
end
if params[:search].present?
if params[:search].present?
Loading