56de781a2c
This reverts commit e00fb2bdc2090e9cabeb1eb35a2672a882cc96e9. # Conflicts: # .rubocop.yml # .rubocop_todo.yml # lib/gitlab/ci/config/entry/global.rb # lib/gitlab/ci/config/entry/jobs.rb # spec/lib/gitlab/ci/config/entry/factory_spec.rb # spec/lib/gitlab/ci/config/entry/global_spec.rb # spec/lib/gitlab/ci/config/entry/job_spec.rb # spec/lib/gitlab/ci/status/build/factory_spec.rb # spec/lib/gitlab/incoming_email_spec.rb
20 lines
457 B
Ruby
20 lines
457 B
Ruby
module MergeRequestsAction
|
|
extend ActiveSupport::Concern
|
|
include IssuableCollections
|
|
|
|
def merge_requests
|
|
@label = merge_requests_finder.labels.first
|
|
|
|
@merge_requests = merge_requests_collection
|
|
.page(params[:page])
|
|
|
|
@collection_type = "MergeRequest"
|
|
@issuable_meta_data = issuable_meta_data(@merge_requests, @collection_type)
|
|
end
|
|
|
|
private
|
|
|
|
def filter_params
|
|
super.merge(non_archived: true)
|
|
end
|
|
end
|