diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-05 17:54:56 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-05 17:54:56 +0000 |
| commit | 0c3ec51f404d6a976472fe069bd4249fdd65aee1 (patch) | |
| tree | 5b8efe62b12bbe30d5863936a6a6d3f7003de25d /app/controllers | |
| parent | c618e5aa6d1381566616f76676ec9c8903468046 (diff) | |
| parent | 06d4f07a041a70fe9462bcae47b1b191908347ab (diff) | |
| download | gitlab-ce-0c3ec51f404d6a976472fe069bd4249fdd65aee1.tar.gz | |
Merge branch 'issue_40500' into 'master'
Improve filtering issues by label performance
Closes #40500 and #37143
See merge request gitlab-org/gitlab-ce!16136
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/concerns/issues_action.rb | 2 | ||||
| -rw-r--r-- | app/controllers/concerns/merge_requests_action.rb | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/app/controllers/concerns/issues_action.rb b/app/controllers/concerns/issues_action.rb index d4cccbe6442..3ba1235cee0 100644 --- a/app/controllers/concerns/issues_action.rb +++ b/app/controllers/concerns/issues_action.rb @@ -5,8 +5,6 @@ module IssuesAction # rubocop:disable Gitlab/ModuleWithInstanceVariables def issues @finder_type = IssuesFinder - @label = finder.labels.first - @issues = issuables_collection .non_archived .page(params[:page]) diff --git a/app/controllers/concerns/merge_requests_action.rb b/app/controllers/concerns/merge_requests_action.rb index 4d44df3bba9..a9cc13038bf 100644 --- a/app/controllers/concerns/merge_requests_action.rb +++ b/app/controllers/concerns/merge_requests_action.rb @@ -5,7 +5,6 @@ module MergeRequestsAction # rubocop:disable Gitlab/ModuleWithInstanceVariables def merge_requests @finder_type = MergeRequestsFinder - @label = finder.labels.first @merge_requests = issuables_collection.page(params[:page]) |