Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-03-16 03:45:46 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-03-16 03:45:46 +0400
commit2ec12c9bb81b28add0b1d7404822d8312ed08d77 (patch)
treeab25efc36477225e65a6d540898102fe31bc4f73 /app/views/events/_event_new_merge_request.html.haml
parente2b39517003bb2045f63c2653471275cbbbc1c10 (diff)
Impoved merge requests show page. Minor style improvements across project
Diffstat (limited to 'app/views/events/_event_new_merge_request.html.haml')
-rw-r--r--app/views/events/_event_new_merge_request.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/events/_event_new_merge_request.html.haml b/app/views/events/_event_new_merge_request.html.haml
index e6895351106..e3d8ab2a62d 100644
--- a/app/views/events/_event_new_merge_request.html.haml
+++ b/app/views/events/_event_new_merge_request.html.haml
@@ -1,6 +1,7 @@
= image_tag gravatar_icon(event.author_email), :class => "avatar"
%strong #{event.author_name}
-requested merge
+%span.label.success requested
+&nbsp;merge
= link_to project_merge_request_path(event.project, event.merge_request) do
%strong= truncate event.merge_request_title
at
@@ -8,7 +9,6 @@ at
%span.cgray
= time_ago_in_words(event.created_at)
ago.
-%br
%span.label= event.merge_request.source_branch
&rarr;
%span.label= event.merge_request.target_branch