diff options
| author | Mike Greiling <mike@pixelcog.com> | 2016-12-13 18:57:01 +0300 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-12-21 10:36:05 +0300 |
| commit | 4e3b9e03f8ef64a39f587c53e45b2f8d4cf571db (patch) | |
| tree | 0893498d60cca45c7550513d68bb88c3730f8203 /app/views | |
| parent | 26a80149b0381e678ac6b4f13340e81055be3406 (diff) | |
remove button class size alteration from revert and cherry pick links
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/merge_requests/widget/_merged_buttons.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/widget/_merged_buttons.haml b/app/views/projects/merge_requests/widget/_merged_buttons.haml index d836a253507..81abb543d57 100644 --- a/app/views/projects/merge_requests/widget/_merged_buttons.haml +++ b/app/views/projects/merge_requests/widget/_merged_buttons.haml @@ -9,6 +9,6 @@ = icon('trash-o') Remove Source Branch - if mr_can_be_reverted - = revert_commit_link(@merge_request.merge_commit, namespace_project_merge_request_path(@project.namespace, @project, @merge_request), btn_class: 'sm') + = revert_commit_link(@merge_request.merge_commit, namespace_project_merge_request_path(@project.namespace, @project, @merge_request), btn_class: "warning") - if mr_can_be_cherry_picked - = cherry_pick_commit_link(@merge_request.merge_commit, namespace_project_merge_request_path(@project.namespace, @project, @merge_request), btn_class: 'sm') + = cherry_pick_commit_link(@merge_request.merge_commit, namespace_project_merge_request_path(@project.namespace, @project, @merge_request), btn_class: "default") |