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
Léo-Paul Géneau
gitlab-ce
Commits
e5854814
Commit
e5854814
authored
Jul 17, 2018
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add cross-link to N+1 issue
[ci-skip]
parent
05b25f5a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
0 deletions
+1
-0
app/models/project.rb
app/models/project.rb
+1
-0
No files found.
app/models/project.rb
View file @
e5854814
...
@@ -2171,6 +2171,7 @@ class Project < ActiveRecord::Base
...
@@ -2171,6 +2171,7 @@ class Project < ActiveRecord::Base
merge_requests
=
source_of_merge_requests
.
opened
merge_requests
=
source_of_merge_requests
.
opened
.
where
(
allow_collaboration:
true
)
.
where
(
allow_collaboration:
true
)
# Issue for N+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/49322
Gitlab
::
GitalyClient
.
allow_n_plus_1_calls
do
Gitlab
::
GitalyClient
.
allow_n_plus_1_calls
do
if
branch_name
if
branch_name
merge_requests
.
find_by
(
source_branch:
branch_name
)
&
.
can_be_merged_by?
(
user
)
merge_requests
.
find_by
(
source_branch:
branch_name
)
&
.
can_be_merged_by?
(
user
)
...
...
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