diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 11:26:19 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 11:26:19 +0300 |
| commit | 84727fba96c6794874e1f94d581408b70e1842a7 (patch) | |
| tree | eeaf4adf7574d0817f3413d5f36bd894a01fdf11 /app/views/projects/merge_requests/widget/open/_accept.html.haml | |
| parent | f293d991a4bd55df10ff8dc9201b6b45377a6681 (diff) | |
Revert "Merge branch 'improve-merge-requests' into 'master'
"
This reverts commit 4773f38e28c91dbbb6e5e385e0c403877298bfed, reversing
changes made to 0d5d80b735eb18ae79eb2bfe26c08896d53db414.
Diffstat (limited to 'app/views/projects/merge_requests/widget/open/_accept.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/widget/open/_accept.html.haml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/views/projects/merge_requests/widget/open/_accept.html.haml b/app/views/projects/merge_requests/widget/open/_accept.html.haml index 1be98cbe8de..3c0cd25ba07 100644 --- a/app/views/projects/merge_requests/widget/open/_accept.html.haml +++ b/app/views/projects/merge_requests/widget/open/_accept.html.haml @@ -18,6 +18,12 @@ text: @merge_request.merge_commit_message, rows: 14, hint: true + %br + .light + If you want to merge this request manually, you can use the + %strong + = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal" + :coffeescript $('.accept-mr-form').on 'ajax:before', -> btn = $('.accept_merge_request') |