diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-06 13:04:57 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-06 13:04:57 +0100 |
| commit | 2a18425e97023b05aa52c29dbce6c5a7aa7400b7 (patch) | |
| tree | 42360416a8337267dd75493fbde5021a333e6431 /app/views/projects/notes | |
| parent | 75ac269987a30dc3eedb9ce47c83299abf9b7cd9 (diff) | |
| download | gitlab-ce-2a18425e97023b05aa52c29dbce6c5a7aa7400b7.tar.gz | |
phil review changes
Diffstat (limited to 'app/views/projects/notes')
| -rw-r--r-- | app/views/projects/notes/_comment_type_button.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/notes/_comment_type_button.html.haml b/app/views/projects/notes/_comment_type_button.html.haml index 2a851d57fd6..1444a9d1b65 100644 --- a/app/views/projects/notes/_comment_type_button.html.haml +++ b/app/views/projects/notes/_comment_type_button.html.haml @@ -3,10 +3,10 @@ .pull-left.btn-group.append-right-10.comment-type-dropdown.js-comment-type-dropdown %input.btn.btn-nr.btn-create.comment-btn.js-comment-button.js-comment-submit-button{ type: 'submit', value: 'Comment' } - if @note.can_be_discussion_note? - = button_tag type: 'button', class: 'btn btn-nr dropdown-toggle comment-btn js-note-new-discussion', data: { 'dropdown-trigger' => '#resolvable-comment-menu' } do + = button_tag type: 'button', class: 'btn btn-nr dropdown-toggle comment-btn js-note-new-discussion js-disable-on-submit', data: { 'dropdown-trigger' => '#resolvable-comment-menu' }, 'aria-label' => 'Open comment type dropdown' do = icon('caret-down') %ul#resolvable-comment-menu.dropdown-menu{ data: { dropdown: true } } - %li#comment{ data: { value: '', 'button-text' => 'Comment', 'secondary-button-text' => 'Comment & close merge request' }, class: 'droplab-item-selected' } + %li#comment.droplab-item-selected{ data: { value: '', 'button-text' => 'Comment', 'secondary-button-text' => "Comment & close #{noteable_type.titleize.downcase}" } } = icon('check') .description %strong Comment |