diff options
author | barthc <mackintosh02@gmail.com> | 2016-06-27 21:22:19 +0100 |
---|---|---|
committer | barthc <mackintosh02@gmail.com> | 2016-09-20 14:39:15 +0100 |
commit | 418e95bd5f623c4cbeac8f5c2fdf2a50e8893339 (patch) | |
tree | 76a2ae21d1499233e6c491cb26a2620060fb6ce4 /app/controllers/concerns/issuable_collections.rb | |
parent | f30005f0a99b6ab019af22a8b7db40aecd1ff066 (diff) | |
download | gitlab-ce-418e95bd5f623c4cbeac8f5c2fdf2a50e8893339.tar.gz |
fix issues mr counter
Diffstat (limited to 'app/controllers/concerns/issuable_collections.rb')
-rw-r--r-- | app/controllers/concerns/issuable_collections.rb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/app/controllers/concerns/issuable_collections.rb b/app/controllers/concerns/issuable_collections.rb index b5e79099e39..4a447735fa7 100644 --- a/app/controllers/concerns/issuable_collections.rb +++ b/app/controllers/concerns/issuable_collections.rb @@ -13,10 +13,18 @@ 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 @@ -54,6 +62,10 @@ 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 |