diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-03-03 09:53:06 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-03-03 09:53:06 +0000 |
| commit | 7e710acc1c72de7d11ad393ee3e111e250e0cb66 (patch) | |
| tree | 46e4225a7932d5866a76b75ae02f116193450de2 /app | |
| parent | 1fa7671f44291f78131c0fa31f6d1ffcb3ff6bbc (diff) | |
| parent | 7dd2e37a9d5c2c6acc45bf636432154ed0d73164 (diff) | |
| download | gitlab-ce-7e710acc1c72de7d11ad393ee3e111e250e0cb66.tar.gz | |
Merge branch 'issue_4095' into 'master'
Don't show Issues/MRs from archived projects in Groups view
Fixes #4095
See merge request !2980
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/concerns/issues_action.rb | 2 | ||||
| -rw-r--r-- | app/controllers/concerns/merge_requests_action.rb | 2 | ||||
| -rw-r--r-- | app/models/concerns/issuable.rb | 1 | ||||
| -rw-r--r-- | app/models/project.rb | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/app/controllers/concerns/issues_action.rb b/app/controllers/concerns/issues_action.rb index 5b098628557..ef8e74a4641 100644 --- a/app/controllers/concerns/issues_action.rb +++ b/app/controllers/concerns/issues_action.rb @@ -2,7 +2,7 @@ module IssuesAction extend ActiveSupport::Concern def issues - @issues = get_issues_collection + @issues = get_issues_collection.non_archived @issues = @issues.page(params[:page]).per(ApplicationController::PER_PAGE) @issues = @issues.preload(:author, :project) diff --git a/app/controllers/concerns/merge_requests_action.rb b/app/controllers/concerns/merge_requests_action.rb index f6de696e84d..9c49596bd0b 100644 --- a/app/controllers/concerns/merge_requests_action.rb +++ b/app/controllers/concerns/merge_requests_action.rb @@ -2,7 +2,7 @@ module MergeRequestsAction extend ActiveSupport::Concern def merge_requests - @merge_requests = get_merge_requests_collection + @merge_requests = get_merge_requests_collection.non_archived @merge_requests = @merge_requests.page(params[:page]).per(ApplicationController::PER_PAGE) @merge_requests = @merge_requests.preload(:author, :target_project) diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb index e5f089fb8a0..286d6655861 100644 --- a/app/models/concerns/issuable.rb +++ b/app/models/concerns/issuable.rb @@ -38,6 +38,7 @@ module Issuable scope :join_project, -> { joins(:project) } scope :references_project, -> { references(:project) } + scope :non_archived, -> { join_project.merge(Project.non_archived) } delegate :name, :email, diff --git a/app/models/project.rb b/app/models/project.rb index 6f5d592755a..b9810c9cda4 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -278,7 +278,7 @@ class Project < ActiveRecord::Base end def search_by_title(query) - where('projects.archived = ?', false).where('LOWER(projects.name) LIKE :query', query: "%#{query.downcase}%") + non_archived.where('LOWER(projects.name) LIKE :query', query: "%#{query.downcase}%") end def find_with_namespace(id) |