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
path: root/app/views
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-27 13:06:31 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-27 13:06:31 +0400
commitd7b3bbfc4ab9d128f0d9c4734b3a7bebbc5d6eef (patch)
treedac61e12594a7dbb43960a39615f71f30e3f8bb3 /app/views
parentf4889f50fcd9ec8df9a1f44def25bb9ea384a3bf (diff)
Make MR dicussion and changes tabs more noticable
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views')
-rw-r--r--app/views/projects/merge_requests/_show.html.haml2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index 0166b988e58..cbb8c83e4d0 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -12,10 +12,12 @@
= link_to project_merge_request_path(@project, @merge_request) do
%i.icon-comment
Discussion
+ %span.badge= @merge_request.mr_and_commit_notes.count
%li.diffs-tab{data: {action: 'diffs'}}
= link_to diffs_project_merge_request_path(@project, @merge_request) do
%i.icon-list-alt
Changes
+ %span.badge= @merge_request.diffs.size
- content_for :note_actions do
- if can?(current_user, :modify_merge_request, @merge_request)