summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/_merge_request.html.haml
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-03-19 14:43:52 +0200
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-03-19 14:43:52 +0200
commitc8265f13ca0ad7d1bd04a699b61b3aa2f3d1e4e7 (patch)
treea646a24601d8164946c249fbc9cf8482d4b5dabf /app/views/projects/merge_requests/_merge_request.html.haml
parent01b70c6c297c8be013b59c68a0c6b93318dcd021 (diff)
parent4f0302f00ef0c51b67b73429ace0a632971b7f1b (diff)
downloadgitlab-ce-c8265f13ca0ad7d1bd04a699b61b3aa2f3d1e4e7.tar.gz
Merge branch 'master' into gitlab_intro_docs
Diffstat (limited to 'app/views/projects/merge_requests/_merge_request.html.haml')
-rw-r--r--app/views/projects/merge_requests/_merge_request.html.haml6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml
index 18cf3f14f0b..13d0cbdde1d 100644
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
@@ -1,8 +1,8 @@
%li{ class: mr_css_classes(merge_request) }
- .merge-request-title
+ .merge-request-title.title
%span.merge-request-title-text
- = link_to_gfm merge_request.title, merge_request_path(merge_request), class: "title"
- %ul.controls.light
+ = link_to_gfm merge_request.title, merge_request_path(merge_request)
+ %ul.controls
- if merge_request.merged?
%li
MERGED