diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-25 03:09:12 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-25 03:09:12 +0300 |
commit | 0b881f91159cc97ccb7328a2e52977a60ea83fbe (patch) | |
tree | d6b683cb935112aee47121f46e3c5dc84de24f2c /lib | |
parent | 7671216b60e2796a050358ff808b4a0c2de3d22f (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
-rw-r--r-- | lib/api/deployments.rb | 3 | ||||
-rw-r--r-- | lib/banzai/filter/inline_metrics_redactor_filter.rb | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/api/deployments.rb b/lib/api/deployments.rb index 487d4e37a56..cb1dca11e87 100644 --- a/lib/api/deployments.rb +++ b/lib/api/deployments.rb @@ -143,6 +143,7 @@ module API success Entities::MergeRequestBasic end params do + use :pagination requires :deployment_id, type: Integer, desc: 'The deployment ID' use :merge_requests_base_params end @@ -153,7 +154,7 @@ module API mr_params = declared_params.merge(deployment_id: params[:deployment_id]) merge_requests = MergeRequestsFinder.new(current_user, mr_params).execute - present merge_requests, { with: Entities::MergeRequestBasic, current_user: current_user } + present paginate(merge_requests), { with: Entities::MergeRequestBasic, current_user: current_user } end end end diff --git a/lib/banzai/filter/inline_metrics_redactor_filter.rb b/lib/banzai/filter/inline_metrics_redactor_filter.rb index 664a897970a..75bd3325bd4 100644 --- a/lib/banzai/filter/inline_metrics_redactor_filter.rb +++ b/lib/banzai/filter/inline_metrics_redactor_filter.rb @@ -143,3 +143,5 @@ module Banzai end end end + +Banzai::Filter::InlineMetricsRedactorFilter.prepend_if_ee('EE::Banzai::Filter::InlineMetricsRedactorFilter') |