diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-30 21:28:48 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-30 21:28:48 +0400 |
| commit | 1fdeb9e03042b1b645ed0fe6c33fb4f21dd6ddb1 (patch) | |
| tree | 5fa4b6d2892c50057b36991fa3e8ba44c02b6628 /app/views/merge_requests/show/_mr_title.html.haml | |
| parent | 7d593c54463307b0e1bb4a2653e161f4f238a3d9 (diff) | |
| parent | bfd00caff3010100f367ed60d73f065cc8b21f06 (diff) | |
Merge branch 'refactor/css' of dev.gitlabhq.com:gitlab/gitlabhq
Diffstat (limited to 'app/views/merge_requests/show/_mr_title.html.haml')
| -rw-r--r-- | app/views/merge_requests/show/_mr_title.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/merge_requests/show/_mr_title.html.haml b/app/views/merge_requests/show/_mr_title.html.haml index c2ffe8e3770..8119728dcb9 100644 --- a/app/views/merge_requests/show/_mr_title.html.haml +++ b/app/views/merge_requests/show/_mr_title.html.haml @@ -5,7 +5,7 @@ → %span.label_branch= @merge_request.target_branch - %span.right + %span.pull-right - if can?(current_user, :modify_merge_request, @merge_request) - if @merge_request.open? .left.btn-group @@ -17,13 +17,13 @@ %li= link_to "Email Patches", project_merge_request_path(@project, @merge_request, format: :patch) %li= link_to "Plain Diff", project_merge_request_path(@project, @merge_request, format: :diff) - = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {closed: true }, status_only: true), method: :put, class: "btn grouped danger", title: "Close merge request" + = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {closed: true }, status_only: true), method: :put, class: "btn grouped btn-close", title: "Close merge request" = link_to edit_project_merge_request_path(@project, @merge_request), class: "btn grouped" do %i.icon-edit Edit -.right +.pull-right .span3#votes= render 'votes/votes_block', votable: @merge_request .back_link |