diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-11 13:07:43 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-03-11 13:07:43 +0000 |
| commit | d343c7a159a1786e2d43f1a060b7c79edbd67376 (patch) | |
| tree | f9da9679b6dbea6f0d8d418041e72baa9475d184 /app/views/projects/issues/_discussion.html.haml | |
| parent | 1f08363650169925f01261863ee905ad103a177f (diff) | |
| parent | 6690d8e25b0da2fa83e218d6f2411df7cec9ef32 (diff) | |
| download | gitlab-ce-d343c7a159a1786e2d43f1a060b7c79edbd67376.tar.gz | |
Merge branch 'comment-discard-button' into 'master'
Added discard button to comment form
Also changed the labels on the buttons to better match the action they are completing.
Closes #8057
See merge request !3085
Diffstat (limited to 'app/views/projects/issues/_discussion.html.haml')
| -rw-r--r-- | app/views/projects/issues/_discussion.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/issues/_discussion.html.haml b/app/views/projects/issues/_discussion.html.haml index eb9c225df2f..b151393abab 100644 --- a/app/views/projects/issues/_discussion.html.haml +++ b/app/views/projects/issues/_discussion.html.haml @@ -1,7 +1,7 @@ - content_for :note_actions do - if can?(current_user, :update_issue, @issue) - = link_to 'Reopen issue', issue_path(@issue, issue: {state_event: :reopen}, status_only: true, format: 'json'), data: {no_turbolink: true}, class: "btn btn-nr btn-grouped btn-reopen btn-comment js-note-target-reopen #{issue_button_visibility(@issue, false)}", title: 'Reopen issue' - = link_to 'Close issue', issue_path(@issue, issue: {state_event: :close}, status_only: true, format: 'json'), data: {no_turbolink: true}, class: "btn btn-nr btn-grouped btn-close btn-comment js-note-target-close #{issue_button_visibility(@issue, true)}", title: 'Close issue' + = link_to 'Reopen issue', issue_path(@issue, issue: {state_event: :reopen}, status_only: true, format: 'json'), data: {no_turbolink: true, original_text: "Reopen issue", alternative_text: "Comment & reopen issue"}, class: "btn btn-nr btn-grouped btn-reopen btn-comment js-note-target-reopen #{issue_button_visibility(@issue, false)}", title: 'Reopen issue' + = link_to 'Close issue', issue_path(@issue, issue: {state_event: :close}, status_only: true, format: 'json'), data: {no_turbolink: true, original_text: "Close issue", alternative_text: "Comment & close issue"}, class: "btn btn-nr btn-grouped btn-close btn-comment js-note-target-close #{issue_button_visibility(@issue, true)}", title: 'Close issue' #notes = render 'projects/notes/notes_with_form' |