BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 3028a7d2 by Robert Speicher
Options

Merge branch 'issue_14610' into 'master'

Fix cancel button on issuable edit form See merge request !3392
parents 5a460c37 35ef7ff6
Showing with 2 additions and 2 deletions
app/views/shared/issuable/_form.html.haml
...@@ -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', namespace_project_issues_path(@project.namespace, @project), class: 'btn btn-cancel' = link_to 'Cancel', polymorphic_path([@project.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)
...@@ -135,4 +135,4 @@ ...@@ -135,4 +135,4 @@
method: :delete, class: 'btn btn-grouped' do method: :delete, class: 'btn btn-grouped' do
= icon('trash-o') = icon('trash-o')
Delete Delete
= link_to 'Cancel', namespace_project_issue_path(@project.namespace, @project, issuable), class: 'btn btn-grouped btn-cancel' = link_to 'Cancel', polymorphic_path([@project.namespace.becomes(Namespace), @project, issuable]), class: 'btn btn-grouped btn-cancel'
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