Commit 78580939 authored by Scott Hampton's avatar Scott Hampton

Merge branch 'codiini-master-patch-14180' into 'master'

Update buttons in app/views/groups/milestones directory

See merge request gitlab-org/gitlab!47092
parents 771feddc a8dc90ca
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
.form-actions .form-actions
- if @milestone.new_record? - if @milestone.new_record?
= f.submit 'Create milestone', class: "btn-success btn", data: { qa_selector: "create_milestone_button" } = f.submit 'Create milestone', class: "btn-success gl-button btn", data: { qa_selector: "create_milestone_button" }
= link_to "Cancel", group_milestones_path(@group), class: "btn btn-cancel" = link_to "Cancel", group_milestones_path(@group), class: "btn gl-button btn-cancel"
- else - else
= f.submit 'Update milestone', class: "btn-success btn" = f.submit 'Update milestone', class: "btn-success gl-button btn"
= link_to "Cancel", group_milestone_path(@group, @milestone), class: "btn btn-cancel" = link_to "Cancel", group_milestone_path(@group, @milestone), class: "btn gl-button btn-cancel"
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
= render 'shared/milestones/search_form' = render 'shared/milestones/search_form'
= render 'shared/milestones_sort_dropdown' = render 'shared/milestones_sort_dropdown'
- if can?(current_user, :admin_milestone, @group) - if can?(current_user, :admin_milestone, @group)
= link_to "New milestone", new_group_milestone_path(@group), class: "btn btn-success", data: { qa_selector: "new_group_milestone_link" } = link_to "New milestone", new_group_milestone_path(@group), class: "btn gl-button btn-success", data: { qa_selector: "new_group_milestone_link" }
.milestones .milestones
%ul.content-list %ul.content-list
......
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