diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-20 18:08:57 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-20 18:08:57 +0300 |
| commit | 6b5e293c6d5c678e78f2a0933d636a33e4723061 (patch) | |
| tree | b83c7bff3e2329e439fbc6db948f5e14e8b77ac9 /app/views/projects/milestones | |
| parent | be2142bf5e03af8ba9bb96e4bf0b4781184ae01b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/milestones')
| -rw-r--r-- | app/views/projects/milestones/_form.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/milestones/index.html.haml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml index 907af326ec5..a21f519da0e 100644 --- a/app/views/projects/milestones/_form.html.haml +++ b/app/views/projects/milestones/_form.html.haml @@ -22,7 +22,7 @@ .form-actions - if @milestone.new_record? = f.submit _('Create milestone'), class: 'btn-success btn', data: { qa_selector: 'create_milestone_button' } - = link_to _('Cancel'), project_milestones_path(@project), class: 'btn btn-cancel' + = link_to _('Cancel'), project_milestones_path(@project), class: 'gl-button btn btn-cancel' - else = f.submit _('Save changes'), class: 'btn-success btn' - = link_to _('Cancel'), project_milestone_path(@project, @milestone), class: 'btn btn-cancel' + = link_to _('Cancel'), project_milestone_path(@project, @milestone), class: 'gl-button btn btn-cancel' diff --git a/app/views/projects/milestones/index.html.haml b/app/views/projects/milestones/index.html.haml index 2c52d2a5fbc..b964c8b1a93 100644 --- a/app/views/projects/milestones/index.html.haml +++ b/app/views/projects/milestones/index.html.haml @@ -8,7 +8,7 @@ = render 'shared/milestones/search_form' = render 'shared/milestones_sort_dropdown' - if can?(current_user, :admin_milestone, @project) - = link_to new_project_milestone_path(@project), class: 'btn btn-success', data: { qa_selector: "new_project_milestone_link" }, title: _('New milestone') do + = link_to new_project_milestone_path(@project), class: 'gl-button btn btn-success', data: { qa_selector: "new_project_milestone_link" }, title: _('New milestone') do = _('New milestone') .milestones |