deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

refactor buttons pt2

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-01-29 22:29:21 +02:00
parent 033aa1a885
commit fb617c61b9
49 changed files with 90 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/views/merge_requests/_merge_request.html.haml
View file

@ -2,19 +2,19 @@
.right
.left
- if merge_request.merged?
%span.btn.small.disabled.grouped
%span.btn.btn-small.disabled.grouped
%strong
%i.icon-ok
= "MERGED"
- if merge_request.notes.any?
%span.btn.small.disabled.grouped
%span.btn.btn-small.disabled.grouped
%i.icon-comment
= merge_request.mr_and_commit_notes.count
- if merge_request.milestone_id?
%span.btn.small.disabled.grouped
%span.btn.btn-small.disabled.grouped
%i.icon-time
= merge_request.milestone.title
%span.btn.small.disabled.grouped
%span.btn.btn-small.disabled.grouped
= merge_request.source_branch
→
= merge_request.target_branch

2
app/views/merge_requests/show/_mr_accept.html.haml
View file

@ -31,7 +31,7 @@
.automerge_widget.cannot_be_merged{style: "display:none"}
.alert.alert-info
%span
= link_to "Show how to merge", "#", class: "how_to_merge_link btn small padded", title: "How To Merge"
= link_to "Show how to merge", "#", class: "how_to_merge_link btn btn-small padded", title: "How To Merge"
 
%strong This request can't be merged with GitLab. You should do it manually