diff options
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | app/views/shared/issuable/_form.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 043a7b1fa47..deae7218fc9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -16,7 +16,7 @@ v 8.6.2 - Fix an issue hiding the password form when signed-in with a linked account. !3381 - Add links to CI setup documentation from project settings and builds pages. !3384 - Fix an issue with width of project select dropdown. !3386 - - Fix error 500 with cancel button on issuable edit form. !3392 + - Fix error 500 with cancel button on issuable edit form. !3392 + !3417 - Fix background when editing a highlighted note. !3423 - Remove tabstop from the WIP toggle links. !3426 - Ensure private project snippets are not viewable by unauthorized people. diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml index ce75c8c551e..e2a9e5bfb92 100644 --- a/app/views/shared/issuable/_form.html.haml +++ b/app/views/shared/issuable/_form.html.haml @@ -127,7 +127,7 @@ for this project. - if issuable.new_record? - = link_to 'Cancel', polymorphic_path([@project.namespace, @project, issuable.class]), class: 'btn btn-cancel' + = link_to 'Cancel', polymorphic_path([@project.namespace.becomes(Namespace), @project, issuable.class]), class: 'btn btn-cancel' - else .pull-right - if current_user.can?(:"destroy_#{issuable.to_ability_name}", @project) |