diff options
| author | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-10 23:23:01 +0000 |
|---|---|---|
| committer | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-10 23:23:01 +0000 |
| commit | 5e95296278a629df317d769ae70a3bb9513a64cd (patch) | |
| tree | 9e88d2c1fe4b0f42892489be92117006dab5bae1 | |
| parent | a2aa5b7e8e2731c4198cb3f2b9b0d276de709c78 (diff) | |
| parent | bda6d7001964dea97c2f67af58b6658c4f311266 (diff) | |
| download | gitlab-ce-5e95296278a629df317d769ae70a3bb9513a64cd.tar.gz | |
Merge branch '27994-fix-mr-widget-jump' into 'master'
fixes MR widget jump
Closes #27994
See merge request !9146
| -rw-r--r-- | app/assets/javascripts/merge_request.js | 8 | ||||
| -rw-r--r-- | app/views/shared/_commit_message_container.html.haml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/27994-fix-mr-widget-jump.yml | 4 |
3 files changed, 10 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 diff --git a/changelogs/unreleased/27994-fix-mr-widget-jump.yml b/changelogs/unreleased/27994-fix-mr-widget-jump.yml new file mode 100644 index 00000000000..77783e54a3a --- /dev/null +++ b/changelogs/unreleased/27994-fix-mr-widget-jump.yml @@ -0,0 +1,4 @@ +--- +title: Fix MR widget jump +merge_request: 9146 +author: |