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
5ef2048f
Commit
5ef2048f
authored
Dec 21, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix issue related cross-project MRs
parent
4b4cbf0c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/models/concerns/participable.rb
app/models/concerns/participable.rb
+1
-1
app/models/issue.rb
app/models/issue.rb
+1
-1
No files found.
app/models/concerns/participable.rb
View file @
5ef2048f
...
@@ -37,7 +37,7 @@ module Participable
...
@@ -37,7 +37,7 @@ module Participable
# Be aware that this method makes a lot of sql queries.
# Be aware that this method makes a lot of sql queries.
# Save result into variable if you are going to reuse it inside same request
# Save result into variable if you are going to reuse it inside same request
def
participants
(
current_user
=
self
.
author
,
load_lazy_references:
true
)
def
participants
(
current_user
=
self
.
author
)
participants
=
participants
=
Gitlab
::
ReferenceExtractor
.
lazily
do
Gitlab
::
ReferenceExtractor
.
lazily
do
self
.
class
.
participant_attrs
.
flat_map
do
|
attr
|
self
.
class
.
participant_attrs
.
flat_map
do
|
attr
|
...
...
app/models/issue.rb
View file @
5ef2048f
...
@@ -86,7 +86,7 @@ class Issue < ActiveRecord::Base
...
@@ -86,7 +86,7 @@ class Issue < ActiveRecord::Base
def
referenced_merge_requests
def
referenced_merge_requests
Gitlab
::
ReferenceExtractor
.
lazily
do
Gitlab
::
ReferenceExtractor
.
lazily
do
[
self
,
*
notes
].
flat_map
do
|
note
|
[
self
,
*
notes
].
flat_map
do
|
note
|
note
.
all_references
(
load_lazy_references:
false
)
.
merge_requests
note
.
all_references
.
merge_requests
end
end
end
.
sort_by
(
&
:iid
)
end
.
sort_by
(
&
:iid
)
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