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
7d7ae494
Commit
7d7ae494
authored
Dec 05, 2016
by
Gabriel Gizotti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add guard clause to MergeRequest#issues_mentioned_but_not_closing
parent
5d478e5c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
9 deletions
+6
-9
app/models/merge_request.rb
app/models/merge_request.rb
+6
-9
No files found.
app/models/merge_request.rb
View file @
7d7ae494
...
@@ -569,17 +569,14 @@ class MergeRequest < ActiveRecord::Base
...
@@ -569,17 +569,14 @@ class MergeRequest < ActiveRecord::Base
end
end
def
issues_mentioned_but_not_closing
(
current_user
=
self
.
author
)
def
issues_mentioned_but_not_closing
(
current_user
=
self
.
author
)
issues
=
[]
return
[]
unless
target_branch
==
project
.
default_branch
closing_issues
=
[]
if
target_branch
==
project
.
default_branch
ext
=
Gitlab
::
ReferenceExtractor
.
new
(
project
,
current_user
)
ext
=
Gitlab
::
ReferenceExtractor
.
new
(
project
,
current_user
)
ext
.
analyze
(
description
)
ext
.
analyze
(
description
)
issues
=
ext
.
issues
issues
=
ext
.
issues
closing_issues
=
Gitlab
::
ClosingIssueExtractor
.
new
(
project
,
current_user
).
closing_issues
=
Gitlab
::
ClosingIssueExtractor
.
new
(
project
,
current_user
).
closed_by_message
(
description
)
closed_by_message
(
description
)
end
issues
-
closing_issues
issues
-
closing_issues
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