Download as
Browse Code »

Commit 12d55ba6ccb1b2afa02fcc1fc7ca5ffbd0e21cc3

Authored by Dmitriy Zaporozhets
1 parent 86584aa8
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Provide links from Group issues, mr pages to corresponding Dashboard pages

Showing 2 changed files with 12 additions and 5 deletions   Show diff stats
app/views/groups/issues.html.haml
  Diff comments   View file @12d55ba
1 %h3.page-title 1 %h3.page-title
2 - Issues  
3 - %small (assigned to you)  
4 - %small.pull-right #{@issues.total_count} issues 2 + Issues assigned to me
  3 + %span.pull-right #{@issues.total_count} issues
5 4
  5 +%p.light
  6 + Only issues from
  7 + %strong #{@group.name}
  8 + group are listed here. To see all issues you should visit #{link_to 'dashboard', issues_dashboard_path} page.
6 %hr 9 %hr
  10 +
7 .row 11 .row
8 .span3 12 .span3
9 = render 'shared/filter', entity: 'issue' 13 = render 'shared/filter', entity: 'issue'
app/views/groups/merge_requests.html.haml
  Diff comments   View file @12d55ba
1 %h3.page-title 1 %h3.page-title
2 Merge Requests 2 Merge Requests
3 - %small (authored by or assigned to you)  
4 - %small.pull-right #{@merge_requests.total_count} merge requests 3 + %span.pull-right #{@merge_requests.total_count} merge requests
5 4
  5 +%p.light
  6 + Authored or assigned to you from
  7 + %strong #{@group.name}
  8 + group. To see all merge requests you should visit #{link_to 'dashboard', merge_requests_dashboard_path} page.
6 %hr 9 %hr
7 .row 10 .row
8 .span3 11 .span3