diff options
| author | Phil Hughes <me@iamphill.com> | 2017-08-30 11:20:34 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-08-30 11:20:34 +0100 |
| commit | 75c4d2659bbcd51efc44123f3ab2c6496fa0eee2 (patch) | |
| tree | 3b64f1f2d6c532c4472be1ff50662774a3299fa6 /app/views/projects/issues/show.html.haml | |
| parent | a8460f215cc1949b993e774dc00bad0b506abcfa (diff) | |
| parent | 978b4b9cc0374c9cb5680612fe4154f393bbba9c (diff) | |
| download | gitlab-ce-75c4d2659bbcd51efc44123f3ab2c6496fa0eee2.tar.gz | |
Merge branch 'master' into breadcrumbs-improvements
Diffstat (limited to 'app/views/projects/issues/show.html.haml')
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index fd4588ca101..40886c9d597 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -34,7 +34,8 @@ %ul - if can_update_issue %li= link_to 'Edit', edit_project_issue_path(@project, @issue) - - unless current_user == @issue.author + / TODO: simplify condition back #36860 + - if @issue.author && current_user != @issue.author %li= link_to 'Report abuse', new_abuse_report_path(user_id: @issue.author.id, ref_url: issue_url(@issue)) - if can_update_issue %li= link_to 'Close issue', issue_path(@issue, issue: { state_event: :close }, format: 'json'), class: "btn-close #{issue_button_visibility(@issue, true)}", title: 'Close issue' |