Commit 966ade1d authored by Stan Hu's avatar Stan Hu Committed by Rémy Coutable

Merge branch 'issue_14671' into 'master'

Fix cancel button on issuables

Fixes #14671

See merge request !3417
Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent bc80f7fa
...@@ -16,7 +16,7 @@ v 8.6.2 ...@@ -16,7 +16,7 @@ v 8.6.2
- Fix an issue hiding the password form when signed-in with a linked account. !3381 - 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 - Add links to CI setup documentation from project settings and builds pages. !3384
- Fix an issue with width of project select dropdown. !3386 - 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 - Fix background when editing a highlighted note. !3423
- Remove tabstop from the WIP toggle links. !3426 - Remove tabstop from the WIP toggle links. !3426
- Ensure private project snippets are not viewable by unauthorized people. - Ensure private project snippets are not viewable by unauthorized people.
......
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
for this project. for this project.
- if issuable.new_record? - 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 - else
.pull-right .pull-right
- if current_user.can?(:"destroy_#{issuable.to_ability_name}", @project) - if current_user.can?(:"destroy_#{issuable.to_ability_name}", @project)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment