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>2013-08-15 14:13:22 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-15 14:13:22 +0400
commit12d55ba6ccb1b2afa02fcc1fc7ca5ffbd0e21cc3 (patch)
tree10526353733217208732a742f18e28bc89f6b442 /app/views/groups
parent86584aa89f2a0a97eeef1e4eacb2cc8ea9380d12 (diff)
Provide links from Group issues, mr pages to corresponding Dashboard pages
Diffstat (limited to 'app/views/groups')
-rw-r--r--app/views/groups/issues.html.haml10
-rw-r--r--app/views/groups/merge_requests.html.haml7
2 files changed, 12 insertions, 5 deletions
diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml
index 2785f92e41b..482613f172d 100644
--- a/app/views/groups/issues.html.haml
+++ b/app/views/groups/issues.html.haml
@@ -1,9 +1,13 @@
%h3.page-title
- Issues
- %small (assigned to you)
- %small.pull-right #{@issues.total_count} issues
+ Issues assigned to me
+ %span.pull-right #{@issues.total_count} issues
+%p.light
+ Only issues from
+ %strong #{@group.name}
+ group are listed here. To see all issues you should visit #{link_to 'dashboard', issues_dashboard_path} page.
%hr
+
.row
.span3
= render 'shared/filter', entity: 'issue'
diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml
index 93a07f4ed89..8a9b03535bc 100644
--- a/app/views/groups/merge_requests.html.haml
+++ b/app/views/groups/merge_requests.html.haml
@@ -1,8 +1,11 @@
%h3.page-title
Merge Requests
- %small (authored by or assigned to you)
- %small.pull-right #{@merge_requests.total_count} merge requests
+ %span.pull-right #{@merge_requests.total_count} merge requests
+%p.light
+ Authored or assigned to you from
+ %strong #{@group.name}
+ group. To see all merge requests you should visit #{link_to 'dashboard', merge_requests_dashboard_path} page.
%hr
.row
.span3