diff options
| author | Horacio Bertorello <svankie@gmail.com> | 2017-06-29 02:23:38 -0300 |
|---|---|---|
| committer | Horacio Bertorello <svankie@gmail.com> | 2017-06-30 16:22:00 -0300 |
| commit | 3900b2f3783490ec0d5ab7dbbe946b14bdc3b975 (patch) | |
| tree | dbaa30f4241906a1b9559be5b2b03e552203c8b1 /app | |
| parent | a704f9e5803e833d00f3abcf1d68eac9b9701653 (diff) | |
| download | gitlab-ce-3900b2f3783490ec0d5ab7dbbe946b14bdc3b975.tar.gz | |
Hide archived project labels from group issue tracker
Diffstat (limited to 'app')
| -rw-r--r-- | app/finders/labels_finder.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/finders/labels_finder.rb b/app/finders/labels_finder.rb index 042d792dada..ce432ddbfe6 100644 --- a/app/finders/labels_finder.rb +++ b/app/finders/labels_finder.rb @@ -83,7 +83,12 @@ class LabelsFinder < UnionFinder def projects return @projects if defined?(@projects) - @projects = skip_authorization ? Project.all : ProjectsFinder.new(current_user: current_user).execute + @projects = if skip_authorization + Project.all + else + ProjectsFinder.new(params: { non_archived: true }, current_user: current_user).execute + end + @projects = @projects.in_namespace(params[:group_id]) if group? @projects = @projects.where(id: params[:project_ids]) if projects? @projects = @projects.reorder(nil) |