Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
69cb3f21
Commit
69cb3f21
authored
Mar 24, 2021
by
Michelle Gill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove QueryLimiting for MergeRequestsController#merge
parent
fe2022ba
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
7 deletions
+0
-7
ee/app/controllers/ee/projects/merge_requests_controller.rb
ee/app/controllers/ee/projects/merge_requests_controller.rb
+0
-7
No files found.
ee/app/controllers/ee/projects/merge_requests_controller.rb
View file @
69cb3f21
...
...
@@ -16,7 +16,6 @@ module EE
push_frontend_feature_flag
(
:usage_data_i_testing_load_performance_widget_total
,
@project
,
default_enabled:
true
)
end
before_action
:disable_query_limiting_ee_merge
,
only:
[
:merge
]
before_action
:authorize_read_pipeline!
,
only:
[
:container_scanning_reports
,
:dependency_scanning_reports
,
:sast_reports
,
:secret_detection_reports
,
:dast_reports
,
:metrics_reports
,
:coverage_fuzzing_reports
,
...
...
@@ -61,12 +60,6 @@ module EE
def
api_fuzzing_reports
reports_response
(
merge_request
.
compare_api_fuzzing_reports
(
current_user
),
head_pipeline
)
end
private
def
disable_query_limiting_ee_merge
::
Gitlab
::
QueryLimiting
.
disable!
(
'https://gitlab.com/gitlab-org/gitlab/issues/4792'
)
end
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment