kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/app/controllers/concerns/merge_requests_action.rb

21 lines
487 B
Ruby
Raw Normal View History

Refactor duplciate code for groups_controller.rb and slack_service/note_message.rb Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-17 05:03:18 -05:00
module MergeRequestsAction
extend ActiveSupport::Concern
State specific default sort order for issuables Provide more sensible default sort order for issues and merge requests based on the following table: | type | state | default sort order | |----------------|--------|--------------------| | issues | open | last created | | issues | closed | last updated | | issues | all | last created | | merge requests | open | last created | | merge requests | merged | last updated | | merge requests | closed | last updated | | merge requests | all | last created |
2016-07-23 19:28:12 -04:00
include IssuableCollections
Refactor duplciate code for groups_controller.rb and slack_service/note_message.rb Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-17 05:03:18 -05:00
Move ModuleWithInstanceVariables to Gitlab namespace And use .rubocop.yml to exclude paths we don't care, rather than using the cop itself to exclude.
2017-11-22 02:50:36 -05:00
# rubocop:disable Gitlab/ModuleWithInstanceVariables
Refactor duplciate code for groups_controller.rb and slack_service/note_message.rb Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-17 05:03:18 -05:00
def merge_requests
Refactor issuables index actions
2017-11-07 08:34:12 -05:00
@finder_type = MergeRequestsFinder
Label description and Label row - Add label description - Show label row when filtering issues or merge requests by label
2016-02-17 08:52:12 -05:00
Refactor issuables index actions
2017-11-07 08:34:12 -05:00
@merge_requests = issuables_collection.page(params[:page])
Gather issuable metadata to avoid n+ queries on index view
2017-01-23 15:40:25 -05:00
Refactor issuables index actions
2017-11-07 08:34:12 -05:00
@issuable_meta_data = issuable_meta_data(@merge_requests, collection_type)
Refactor duplciate code for groups_controller.rb and slack_service/note_message.rb Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-17 05:03:18 -05:00
end
Move ModuleWithInstanceVariables to Gitlab namespace And use .rubocop.yml to exclude paths we don't care, rather than using the cop itself to exclude.
2017-11-22 02:50:36 -05:00
# rubocop:enable Gitlab/ModuleWithInstanceVariables
Fix Archived project merge requests add to group's Merge Requests counter This is done by: - Extending the IssuableFinder adding the non_archived option to the params - Overriding the #filter_params in the MergeRequestsAction - Passing the non_archived param in the nav/_group.html.haml navbar partial from the groups/merge_requests.html.haml
2016-11-27 05:33:15 -05:00
private
def filter_params
super.merge(non_archived: true)
end
Refactor duplciate code for groups_controller.rb and slack_service/note_message.rb Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-17 05:03:18 -05:00
end
Copy permalink