diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-03-06 17:12:49 +0100 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-03-06 17:12:49 +0100 |
commit | 0e5d065848aa3149efcb5248293f265699b5b57c (patch) | |
tree | 8c9c725befc4847bf963f636a7210ac1fce3778a /lib/api/helpers.rb | |
parent | 46d99dedfbe10dc36c79c6f09d886ad2fc2192b5 (diff) | |
parent | 348dff0a826c45f00f992e761423a22d2ac32bc3 (diff) | |
download | gitlab-ce-23993-drop-ci_projects.tar.gz |
Merge remote-tracking branch 'origin/master' into 23993-drop-ci_projects23993-drop-ci_projects
Diffstat (limited to 'lib/api/helpers.rb')
-rw-r--r-- | lib/api/helpers.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index 4600abc7dc7..9c41146f1e3 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -252,6 +252,10 @@ module API # project helpers def filter_projects(projects) + if params[:membership] + projects = projects.merge(current_user.authorized_projects) + end + if params[:owned] projects = projects.merge(current_user.owned_projects) end |