diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-14 08:30:46 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-14 08:30:46 +0000 |
| commit | 5c53dc5a1e7cbae3e7c281cfb0740d44c771958f (patch) | |
| tree | 6a0b99b311097ba4525592e1663d63c643790d0e /app/views/projects/activity.html.haml | |
| parent | 352362adaff3217a8b5d727bc11faf2718423a26 (diff) | |
| parent | 5f34759ecb630ef410fe1025cf19e37f1dd4615f (diff) | |
| download | gitlab-ce-5c53dc5a1e7cbae3e7c281cfb0740d44c771958f.tar.gz | |
Merge branch 'project-default-view' into 'master'
Allow user to specify content he wants to see on project page
Improvement to !938. Since a lot of people complain on fact they don't like to see README.
Especially since we already have a switcher for dashboard - it kind of acceptable to select behaviour.
User can specify which content he/she wants to see:
cc @JobV @jacobvosmaer @marin @sytses
See merge request !970
Diffstat (limited to 'app/views/projects/activity.html.haml')
| -rw-r--r-- | app/views/projects/activity.html.haml | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/app/views/projects/activity.html.haml b/app/views/projects/activity.html.haml index b486cd4ded4..65674913bb0 100644 --- a/app/views/projects/activity.html.haml +++ b/app/views/projects/activity.html.haml @@ -1,12 +1 @@ -= render 'projects/last_push' -.hidden-xs - - if current_user - %ul.nav.nav-pills.event_filter.pull-right - %li - = link_to namespace_project_path(@project.namespace, @project, format: :atom, private_token: current_user.private_token), title: "Feed", class: 'rss-btn' do - %i.fa.fa-rss - - = render 'shared/event_filter' - %hr -.content_list -= spinner += render 'projects/activity' |