diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-06-12 10:41:50 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-06-12 10:41:50 +0000 |
| commit | f92d6e24239110a4d7d6785560d2b7696054ca30 (patch) | |
| tree | bed03a2ea9e8448c2da60549785c99fe0bad7fd9 | |
| parent | eeee85fbbb7f6a1e1c142994227d2d231d5461a0 (diff) | |
| parent | 91ab3849bd163d41500f33fc94da499b60bfc8c8 (diff) | |
| download | gitlab-ce-f92d6e24239110a4d7d6785560d2b7696054ca30.tar.gz | |
Merge branch 'remove-activity-feed-text' into 'master'
Remove text since rss is now to prominent.
See merge request !1855
| -rw-r--r-- | app/views/dashboard/_activities.html.haml | 1 | ||||
| -rw-r--r-- | app/views/groups/show.html.haml | 1 | ||||
| -rw-r--r-- | app/views/projects/_section.html.haml | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/app/views/dashboard/_activities.html.haml b/app/views/dashboard/_activities.html.haml index ba49013d834..213b5d65b3c 100644 --- a/app/views/dashboard/_activities.html.haml +++ b/app/views/dashboard/_activities.html.haml @@ -6,7 +6,6 @@ %li.pull-right = link_to dashboard_path(:atom, { private_token: current_user.private_token }), class: 'rss-btn' do %i.fa.fa-rss - Activity Feed = render 'shared/event_filter' %hr diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index 0687840af39..d31dae7d648 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -27,7 +27,6 @@ %li = link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed", class: 'rss-btn' do %i.fa.fa-rss - Activity Feed = render 'shared/event_filter' %hr diff --git a/app/views/projects/_section.html.haml b/app/views/projects/_section.html.haml index f4f876f3809..d7b06197f67 100644 --- a/app/views/projects/_section.html.haml +++ b/app/views/projects/_section.html.haml @@ -18,7 +18,6 @@ %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 - Activity Feed = render 'shared/event_filter' %hr |