diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-04-04 09:05:57 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-04-04 09:05:57 +0000 |
| commit | 3dd91f55a048c13e6dc81ec685e521d2fc5a78f5 (patch) | |
| tree | b4db81819109cbbae78e52874f13199b009d3deb /app/models | |
| parent | fee7ad86273b17100d541b68c670a20ca954d673 (diff) | |
| parent | fd090a2fab64332907953a1525cf5c822d983993 (diff) | |
| download | gitlab-ce-3dd91f55a048c13e6dc81ec685e521d2fc5a78f5.tar.gz | |
Merge branch 'issue_14853' into 'master'
Fix bug related to filtering Issues by Label/Milestone.
See merge request !3499
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/concerns/issuable.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb index 47ac22995ab..afa2ca039ae 100644 --- a/app/models/concerns/issuable.rb +++ b/app/models/concerns/issuable.rb @@ -42,7 +42,7 @@ module Issuable scope :join_project, -> { joins(:project) } scope :references_project, -> { references(:project) } - scope :non_archived, -> { join_project.merge(Project.non_archived.only(:where)) } + scope :non_archived, -> { join_project.where(projects: { archived: false }) } delegate :name, :email, |