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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
457e702b
Commit
457e702b
authored
Feb 07, 2018
by
Ahmad Sherif
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove allow_n_plus_1_calls from MergeRequests::CreateService
Fixes #37439 Fixes gitaly#1000
parent
48568a9d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
4 deletions
+1
-4
app/services/merge_requests/create_service.rb
app/services/merge_requests/create_service.rb
+1
-4
No files found.
app/services/merge_requests/create_service.rb
View file @
457e702b
...
...
@@ -9,10 +9,7 @@ module MergeRequests
merge_request
.
source_branch
=
params
[
:source_branch
]
merge_request
.
merge_params
[
'force_remove_source_branch'
]
=
params
.
delete
(
:force_remove_source_branch
)
# n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37439
Gitlab
::
GitalyClient
.
allow_n_plus_1_calls
do
create
(
merge_request
)
end
create
(
merge_request
)
end
def
before_create
(
merge_request
)
...
...
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