diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-10-15 20:21:10 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-10-15 20:21:10 +0000 |
| commit | 3d763907986c64cd14ced1ed7a4cfab1641abea2 (patch) | |
| tree | f60af3ac3fae89c5d7ad85d28d5e8300254e2319 | |
| parent | 9900a8531a4af72956d6505ba9bfc80227d2c3e9 (diff) | |
| parent | d843cbe08d2af5af0ab6a0270aca25dad993e8ed (diff) | |
| download | gitlab-ce-3d763907986c64cd14ced1ed7a4cfab1641abea2.tar.gz | |
Merge branch 'sentences-end-in-periods' into 'master'
Sentences end in periods.
[ci skip]
See merge request !1604
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index e7ac7a0eaa4..eeaa72ed21b 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -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 |