diff options
author | Nur Rony <pro.nmrony@gmail.com> | 2017-02-10 23:21:20 +0600 |
---|---|---|
committer | Nur Rony <pro.nmrony@gmail.com> | 2017-02-10 23:21:20 +0600 |
commit | 8d207c6d89d6365c14a43c7f361cfd0192bd3044 (patch) | |
tree | eb3022493add2186a462617c58deddd593257fd7 | |
parent | 199b17e5569015bf76ddd9364fc555a3a385c564 (diff) | |
download | gitlab-ce-8d207c6d89d6365c14a43c7f361cfd0192bd3044.tar.gz |
fixes MR widget jump
-rw-r--r-- | app/assets/javascripts/merge_request.js | 8 | ||||
-rw-r--r-- | app/views/shared/_commit_message_container.html.haml | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/merge_request.js b/app/assets/javascripts/merge_request.js index 8762ec35b80..e65378cd610 100644 --- a/app/assets/javascripts/merge_request.js +++ b/app/assets/javascripts/merge_request.js @@ -115,8 +115,8 @@ require('./merge_request_tabs'); e.preventDefault(); textarea.val(textarea.data('messageWithDescription')); - $('p.js-with-description-hint').hide(); - $('p.js-without-description-hint').show(); + $('.js-with-description-hint').hide(); + $('.js-without-description-hint').show(); }); $(document).on('click', 'a.js-without-description-link', function(e) { @@ -124,8 +124,8 @@ require('./merge_request_tabs'); e.preventDefault(); textarea.val(textarea.data('messageWithoutDescription')); - $('p.js-with-description-hint').show(); - $('p.js-without-description-hint').hide(); + $('.js-with-description-hint').show(); + $('.js-without-description-hint').hide(); }); }; diff --git a/app/views/shared/_commit_message_container.html.haml b/app/views/shared/_commit_message_container.html.haml index c196bc06b17..4b98ff88241 100644 --- a/app/views/shared/_commit_message_container.html.haml +++ b/app/views/shared/_commit_message_container.html.haml @@ -17,9 +17,9 @@ Try to keep the first line under 52 characters and the others under 72. - if descriptions.present? - %p.hint.js-with-description-hint + .hint.js-with-description-hint = link_to "#", class: "js-with-description-link" do Include description in commit message - %p.hint.js-without-description-hint.hide + .hint.js-without-description-hint.hide = link_to "#", class: "js-without-description-link" do Don't include description in commit message |