diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-16 17:13:14 -0500 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-16 17:13:14 -0500 |
| commit | d0eb9438e9b258d2fa399a7e54bdfd332e307252 (patch) | |
| tree | c588717a5b722252d912b7c95b2b32594c9a56ac /app/finders | |
| parent | 7657d202160e04e6b5e5412d949977bc48cdacea (diff) | |
| parent | 4ade5ff42511d7931bebb28098c2dc2192caba3e (diff) | |
| download | gitlab-ce-d0eb9438e9b258d2fa399a7e54bdfd332e307252.tar.gz | |
Merge remote-tracking branch 'origin/master' into with-pipeline-view
Diffstat (limited to 'app/finders')
| -rw-r--r-- | app/finders/issuable_finder.rb | 4 | ||||
| -rw-r--r-- | app/finders/notes_finder.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb index f00f3f709e9..5849e00662b 100644 --- a/app/finders/issuable_finder.rb +++ b/app/finders/issuable_finder.rb @@ -252,8 +252,8 @@ class IssuableFinder if filter_by_no_milestone? items = items.where(milestone_id: [-1, nil]) elsif filter_by_upcoming_milestone? - upcoming = Milestone.where(project_id: projects).upcoming - items = items.joins(:milestone).where(milestones: { title: upcoming.try(:title) }) + upcoming_ids = Milestone.upcoming_ids_by_projects(projects) + items = items.joins(:milestone).where(milestone_id: upcoming_ids) else items = items.joins(:milestone).where(milestones: { title: params[:milestone_title] }) diff --git a/app/finders/notes_finder.rb b/app/finders/notes_finder.rb index fa4c635f55c..c41be333537 100644 --- a/app/finders/notes_finder.rb +++ b/app/finders/notes_finder.rb @@ -10,7 +10,7 @@ class NotesFinder notes = case target_type when "commit" - project.notes.for_commit_id(target_id).not_inline + project.notes.for_commit_id(target_id).non_diff_notes when "issue" project.issues.find(target_id).notes.nonawards.inc_author when "merge_request" |