diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-03-28 07:24:20 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-03-30 07:39:14 +0200 |
| commit | 966ade1d7509d7acaad3c59c5d6cd23c560d72bd (patch) | |
| tree | 379d214291f584ae62d2f17ef3010a9f1854bd12 | |
| parent | bc80f7faffe550d7005d74014274115fa8fa00d7 (diff) | |
| download | gitlab-ce-966ade1d7509d7acaad3c59c5d6cd23c560d72bd.tar.gz | |
Merge branch 'issue_14671' into 'master'
Fix cancel button on issuables
Fixes #14671
See merge request !3417
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -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) |