diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-03-28 07:24:20 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-03-28 07:24:20 +0000 |
| commit | 30e4d3ce9a18340c689557cd0c7b5f69e48795d4 (patch) | |
| tree | d99d8375d5fa3702d1c9725a6a19667279503eb1 | |
| parent | ccf50e81b7b977b2034e7455bb72835707d1657c (diff) | |
| parent | 5f6166a256561a9767b28b309cff118bb299500d (diff) | |
| download | gitlab-ce-30e4d3ce9a18340c689557cd0c7b5f69e48795d4.tar.gz | |
Merge branch 'issue_14671' into 'master'
Fix cancel button on issuables
Fixes #14671
See merge request !3417
| -rw-r--r-- | app/views/shared/issuable/_form.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml index 6a42a6e3f58..178223fb463 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) |