summaryrefslogtreecommitdiff
path: root/app/finders
diff options
context:
space:
mode:
author🙈 jacopo beschi 🙉 <intrip@gmail.com>2018-01-11 16:34:01 +0000
committerRobert Speicher <robert@gitlab.com>2018-01-11 16:34:01 +0000
commit729f05f0e3c4835c91e20ccd1ddb630eb7ef4379 (patch)
tree3d543c84930ce20b7c91d48295bf3e106c788cde /app/finders
parentca8394e8e4931c85b5f2a2bde1951bcb9419e220 (diff)
downloadgitlab-ce-729f05f0e3c4835c91e20ccd1ddb630eb7ef4379.tar.gz
Adds Rubocop rule for line break around conditionals
Diffstat (limited to 'app/finders')
-rw-r--r--app/finders/group_descendants_finder.rb3
-rw-r--r--app/finders/group_projects_finder.rb1
2 files changed, 4 insertions, 0 deletions
diff --git a/app/finders/group_descendants_finder.rb b/app/finders/group_descendants_finder.rb
index 1a5f6063437..58570a580f1 100644
--- a/app/finders/group_descendants_finder.rb
+++ b/app/finders/group_descendants_finder.rb
@@ -63,6 +63,7 @@ class GroupDescendantsFinder
groups_table = Group.arel_table
visible_to_user = groups_table[:visibility_level]
.in(Gitlab::VisibilityLevel.levels_for_user(current_user))
+
if current_user
authorized_groups = GroupsFinder.new(current_user,
all_available: false)
@@ -115,6 +116,7 @@ class GroupDescendantsFinder
else
direct_child_groups
end
+
groups.with_selects_for_list(archived: params[:archived]).order_by(sort)
end
@@ -140,6 +142,7 @@ class GroupDescendantsFinder
else
direct_child_projects
end
+
projects.with_route.order_by(sort)
end
diff --git a/app/finders/group_projects_finder.rb b/app/finders/group_projects_finder.rb
index 6e8733bb49c..f2d3b90b8e2 100644
--- a/app/finders/group_projects_finder.rb
+++ b/app/finders/group_projects_finder.rb
@@ -34,6 +34,7 @@ class GroupProjectsFinder < ProjectsFinder
else
collection_without_user
end
+
union(projects)
end