diff options
| author | ZJ van de Weg <zegerjan@gitlab.com> | 2016-05-30 14:46:23 +0200 |
|---|---|---|
| committer | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-05-30 18:54:08 +0200 |
| commit | cbd7801b3d1d435a95ec70032c5acc9df33b0337 (patch) | |
| tree | 7bd367bf31690e4a6b0115d238cf2c312c9fb2ab /app/finders | |
| parent | f99b38c9d5dab11677b2680a671c1a66fb69283b (diff) | |
| parent | 2485bd7bbf9686f993d2a417943feff5c7d5b6f3 (diff) | |
| download | gitlab-ce-cbd7801b3d1d435a95ec70032c5acc9df33b0337.tar.gz | |
Merge branch 'master' into awardables
Diffstat (limited to 'app/finders')
| -rw-r--r-- | app/finders/group_projects_finder.rb | 2 | ||||
| -rw-r--r-- | app/finders/issuable_finder.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/finders/group_projects_finder.rb b/app/finders/group_projects_finder.rb index 3b9a421b118..aa8f4c1d0e4 100644 --- a/app/finders/group_projects_finder.rb +++ b/app/finders/group_projects_finder.rb @@ -18,7 +18,7 @@ class GroupProjectsFinder < UnionFinder projects = [] if current_user - if @group.users.include?(current_user) + if @group.users.include?(current_user) || current_user.admin? projects << @group.projects unless only_shared projects << @group.shared_projects unless only_owned else diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb index 5849e00662b..8ed3ccf1c02 100644 --- a/app/finders/issuable_finder.rb +++ b/app/finders/issuable_finder.rb @@ -250,12 +250,12 @@ class IssuableFinder def by_milestone(items) if milestones? if filter_by_no_milestone? - items = items.where(milestone_id: [-1, nil]) + items = items.left_joins_milestones.where(milestone_id: [-1, nil]) elsif filter_by_upcoming_milestone? upcoming_ids = Milestone.upcoming_ids_by_projects(projects) - items = items.joins(:milestone).where(milestone_id: upcoming_ids) + items = items.left_joins_milestones.where(milestone_id: upcoming_ids) else - items = items.joins(:milestone).where(milestones: { title: params[:milestone_title] }) + items = items.with_milestone(params[:milestone_title]) if projects items = items.where(milestones: { project_id: projects }) |