summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-21 17:37:17 +0200
committerDouwe Maan <douwe@gitlab.com>2015-04-23 17:11:39 +0200
commitcd450221eba88110ea065a72e29ae5020ff817e3 (patch)
tree5a86ef8ef630c1cf63074970fa3c301bad91c2a9
parent059cc16430e6b45c6753f05224fc64aa85fd8900 (diff)
downloadgitlab-ce-cd450221eba88110ea065a72e29ae5020ff817e3.tar.gz
Rename "News Feed" buttons to "Activity Feed"
-rw-r--r--app/views/dashboard/_activities.html.haml2
-rw-r--r--app/views/groups/show.html.haml2
-rw-r--r--app/views/projects/show.html.haml2
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/dashboard/_activities.html.haml b/app/views/dashboard/_activities.html.haml
index ffc893b16d3..b4fe8fecf99 100644
--- a/app/views/dashboard/_activities.html.haml
+++ b/app/views/dashboard/_activities.html.haml
@@ -5,7 +5,7 @@
%li.pull-right
= link_to dashboard_path(:atom, { private_token: current_user.private_token }), class: 'rss-btn' do
%i.fa.fa-rss
- News Feed
+ Activity Feed
= render 'shared/event_filter'
%hr
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index c4a7800c463..70a18f064be 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -23,7 +23,7 @@
%li
= link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed", class: 'rss-btn' do
%i.fa.fa-rss
- News Feed
+ Activity Feed
= render 'shared/event_filter'
%hr
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index 3342a7e99bc..f85705ffdd2 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -49,7 +49,7 @@
%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
- News Feed
+ Activity Feed
= render 'shared/event_filter'
%hr