Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
afef4222486d
Commit
3d763907
authored
Oct 15, 2015
by
Robert Speicher
Browse files
Merge branch 'sentences-end-in-periods' into 'master'
Sentences end in periods. [ci skip] See merge request !1604
parents
7f25f8f4d8cb
65fa87bb2b34
Changes
1
Hide whitespace changes
Inline
Side-by-side
app/views/projects/merge_requests/_show.html.haml
View file @
afef4222
...
...
@@ -36,7 +36,8 @@
-
if
@merge_request
.
open?
&&
@merge_request
.
can_be_merged?
.light.append-bottom-20
You can also accept this merge request manually using the
=
link_to
"command line"
,
"#modal_merge_info"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
=
succeed
'.'
do
=
link_to
"command line"
,
"#modal_merge_info"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
-
if
@commits
.
present?
%ul
.merge-request-tabs
...
...
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