diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-02-14 19:09:52 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-02-14 19:09:52 +0000 |
| commit | efc82ebf3f7378f848b65c0a45a4052316bfd6db (patch) | |
| tree | e5df1ae3557663b5584b6488b6db7e9a1a03ef33 /lib/api/helpers.rb | |
| parent | 6676b4f0dd05ffb6071a3329cca4459e7cddcdc3 (diff) | |
| parent | ad5e772bddd7b417fa7a36629db02c69b1b9864d (diff) | |
| download | gitlab-ce-efc82ebf3f7378f848b65c0a45a4052316bfd6db.tar.gz | |
Merge branch 'master' into 'dz-nested-groups-improvements-3'
# Conflicts:
# doc/api/projects.md
Diffstat (limited to 'lib/api/helpers.rb')
| -rw-r--r-- | lib/api/helpers.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index dfab60f7fa5..13896dd91b9 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -256,6 +256,14 @@ module API # project helpers def filter_projects(projects) + if params[:owned] + projects = projects.merge(current_user.owned_projects) + end + + if params[:starred] + projects = projects.merge(current_user.starred_projects) + end + if params[:search].present? projects = projects.search(params[:search]) end |