diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-09-22 15:23:01 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-09-22 15:43:43 +0200 |
| commit | d4e91b22fcef64cef412eb81086ef1c90ca55f22 (patch) | |
| tree | 137e11ccc16cb292b2f7fa9f1d2ad4fb14e3fcd7 /app/controllers/concerns | |
| parent | dfc2fe774de3a1768afe4e2fb24f32858b430da5 (diff) | |
| download | gitlab-ce-d4e91b22fcef64cef412eb81086ef1c90ca55f22.tar.gz | |
Revert part of "Merge branch 'update_issues_mr_counter' into 'master'
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/controllers/concerns')
| -rw-r--r-- | app/controllers/concerns/issuable_collections.rb | 12 | ||||
| -rw-r--r-- | app/controllers/concerns/issues_action.rb | 2 | ||||
| -rw-r--r-- | app/controllers/concerns/merge_requests_action.rb | 2 |
3 files changed, 0 insertions, 16 deletions
diff --git a/app/controllers/concerns/issuable_collections.rb b/app/controllers/concerns/issuable_collections.rb index 4a447735fa7..b5e79099e39 100644 --- a/app/controllers/concerns/issuable_collections.rb +++ b/app/controllers/concerns/issuable_collections.rb @@ -13,18 +13,10 @@ module IssuableCollections issues_finder.execute end - def all_issues_collection - IssuesFinder.new(current_user, filter_params_all).execute - end - def merge_requests_collection merge_requests_finder.execute end - def all_merge_requests_collection - MergeRequestsFinder.new(current_user, filter_params_all).execute - end - def issues_finder @issues_finder ||= issuable_finder_for(IssuesFinder) end @@ -62,10 +54,6 @@ module IssuableCollections @filter_params end - def filter_params_all - @filter_params_all ||= filter_params.merge(state: 'all', sort: nil) - end - def set_default_scope params[:scope] = 'all' if params[:scope].blank? end diff --git a/app/controllers/concerns/issues_action.rb b/app/controllers/concerns/issues_action.rb index eced9d9d678..b89fb94be6e 100644 --- a/app/controllers/concerns/issues_action.rb +++ b/app/controllers/concerns/issues_action.rb @@ -10,8 +10,6 @@ module IssuesAction .preload(:author, :project) .page(params[:page]) - @all_issues = all_issues_collection.non_archived - respond_to do |format| format.html format.atom { render layout: false } diff --git a/app/controllers/concerns/merge_requests_action.rb b/app/controllers/concerns/merge_requests_action.rb index 729763169e2..a1b0eee37f9 100644 --- a/app/controllers/concerns/merge_requests_action.rb +++ b/app/controllers/concerns/merge_requests_action.rb @@ -9,7 +9,5 @@ module MergeRequestsAction .non_archived .preload(:author, :target_project) .page(params[:page]) - - @all_merge_requests = all_merge_requests_collection.non_archived end end |
