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
Jérome Perrin
gitlab-ce
Commits
e78c701a
Commit
e78c701a
authored
Nov 06, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pass the Gitlab::Git::Branch object to Repository#merged_to_root_ref?
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
ad937d27
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
4 deletions
+1
-4
lib/api/entities.rb
lib/api/entities.rb
+1
-4
No files found.
lib/api/entities.rb
View file @
e78c701a
...
...
@@ -242,10 +242,7 @@ module API
end
expose
:merged
do
|
repo_branch
,
options
|
# n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37442
Gitlab
::
GitalyClient
.
allow_n_plus_1_calls
do
options
[
:project
].
repository
.
merged_to_root_ref?
(
repo_branch
.
name
,
options
[
:merged_branch_names
])
end
options
[
:project
].
repository
.
merged_to_root_ref?
(
repo_branch
,
options
[
:merged_branch_names
])
end
expose
:protected
do
|
repo_branch
,
options
|
...
...
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