diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-05-08 14:56:53 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-05-08 14:56:53 -0500 |
| commit | 2f003b58645b3cbc987c240f844b1ff6eb0c026a (patch) | |
| tree | 07c2087939b6c6dce33620c57a6989d76547e681 /lib/api/internal.rb | |
| parent | 204dca4436f5b2c82611a873d05186ec4ff4c17c (diff) | |
| parent | 2084301b4ec863d65638cc0c30c124cb5fe4b3d8 (diff) | |
| download | gitlab-ce-11-11-stable-prepare-rc2.tar.gz | |
Merge branch 'rs-pre-freeze' into 11-11-stable-prepare-rc211-11-stable-prepare-rc2
Diffstat (limited to 'lib/api/internal.rb')
| -rw-r--r-- | lib/api/internal.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/internal.rb b/lib/api/internal.rb index 00f0bbab231..c82fd230d7a 100644 --- a/lib/api/internal.rb +++ b/lib/api/internal.rb @@ -265,6 +265,8 @@ module API params[:changes], push_options.as_json) if Feature.enabled?(:mr_push_options, default_enabled: true) + Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/61359') + mr_options = push_options.get(:merge_request) output.merge!(process_mr_push_options(mr_options, project, user, params[:changes])) if mr_options.present? end |