Moving repositories spec to roles. Added missing spec for project

This commit is contained in:
Dmitriy Zaporozhets 2012-12-15 12:32:09 +02:00
parent 120f50cff4
commit 0f7d3f591c
4 changed files with 101 additions and 98 deletions

View file

@ -1,7 +1,11 @@
.main_box
.top_box_content
%h4.box-title
- if @merge_request.closed
- if @merge_request.merged
.error.status_info
%i.icon-ok
Merged
- elsif @merge_request.closed
.error.status_info Closed
= gfm escape_once(@merge_request.title)

View file

@ -6,11 +6,6 @@
%span.label_branch= @merge_request.target_branch
%span.right
- if @merge_request.merged?
%span.btn.small.disabled.grouped.success
%strong
%i.icon-ok
= "MERGED"
- if can?(current_user, :modify_merge_request, @merge_request)
- if @merge_request.open?
.left.btn-group