summaryrefslogtreecommitdiff
path: root/app/controllers/groups
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@vanlanduyt.co>2018-06-04 10:41:56 +0200
committerBob Van Landuyt <bob@vanlanduyt.co>2018-06-04 17:43:13 +0200
commit2f50b206f2921faf47637af526d810bc10ffb3ef (patch)
tree33d200cc365463a5949ca5ee84bf92c8eaa56693 /app/controllers/groups
parent35ba75f6b93c77f078ab2cf538a256f8aa534eb3 (diff)
downloadgitlab-ce-2f50b206f2921faf47637af526d810bc10ffb3ef.tar.gz
Hide archived projects from `shared_projects`bvl-hide-archived-shared-projects
Since we don't show the archived projects, we shouldnot load them and pass them to the fronted to be filtered out again.
Diffstat (limited to 'app/controllers/groups')
-rw-r--r--app/controllers/groups/shared_projects_controller.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/groups/shared_projects_controller.rb b/app/controllers/groups/shared_projects_controller.rb
index f2f835767e0..7dec1f5f402 100644
--- a/app/controllers/groups/shared_projects_controller.rb
+++ b/app/controllers/groups/shared_projects_controller.rb
@@ -24,7 +24,9 @@ module Groups
# Make the `search` param consistent for the frontend,
# which will be using `filter`.
params[:search] ||= params[:filter] if params[:filter]
- params.permit(:sort, :search)
+ # Don't show archived projects
+ params[:non_archived] = true
+ params.permit(:sort, :search, :non_archived)
end
end
end