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
fedba9fc
Commit
fedba9fc
authored
Nov 29, 2016
by
Gabriel Gizotti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add mentioned but not closed message to the same line as closes issueswq
parent
9e321043
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
13 deletions
+14
-13
app/views/projects/merge_requests/widget/_open.html.haml
app/views/projects/merge_requests/widget/_open.html.haml
+14
-13
No files found.
app/views/projects/merge_requests/widget/_open.html.haml
View file @
fedba9fc
...
@@ -30,19 +30,20 @@
...
@@ -30,19 +30,20 @@
-
elsif
@merge_request
.
can_be_merged?
||
resolved_conflicts
-
elsif
@merge_request
.
can_be_merged?
||
resolved_conflicts
=
render
'projects/merge_requests/widget/open/accept'
=
render
'projects/merge_requests/widget/open/accept'
-
if
mr_issues_mentioned_but_not_closing
.
present?
-
if
mr_closes_issues
.
present?
||
mr_issues_mentioned_but_not_closing
.mr-widget-footer
%span
%i
.fa.fa-info-circle
#{
"Issue"
.
pluralize
(
mr_issues_mentioned_but_not_closing
.
size
)
}
mentioned but not being closed:
=
succeed
'.'
do
!=
markdown
issues_sentence
(
mr_issues_mentioned_but_not_closing
),
pipeline: :gfm
,
author:
@merge_request
.
author
-
if
mr_closes_issues
.
present?
.mr-widget-footer
.mr-widget-footer
%span
%span
=
icon
(
'check'
)
=
icon
(
'check'
)
Accepting this merge request will close
#{
"issue"
.
pluralize
(
mr_closes_issues
.
size
)
}
-
if
mr_closes_issues
.
present?
=
succeed
'.'
do
Accepting this merge request will close
#{
"issue"
.
pluralize
(
mr_closes_issues
.
size
)
}
!=
markdown
issues_sentence
(
mr_closes_issues
),
pipeline: :gfm
,
author:
@merge_request
.
author
=
succeed
'.'
do
=
mr_assign_issues_link
!=
markdown
issues_sentence
(
mr_closes_issues
),
pipeline: :gfm
,
author:
@merge_request
.
author
=
mr_assign_issues_link
-
if
mr_issues_mentioned_but_not_closing
.
present?
#{
"Issue"
.
pluralize
(
mr_issues_mentioned_but_not_closing
.
size
)
}
=
succeed
''
do
!=
markdown
issues_sentence
(
mr_issues_mentioned_but_not_closing
),
pipeline: :gfm
,
author:
@merge_request
.
author
=
succeed
''
do
mentioned but not closed.
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