summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-03-09 07:36:53 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-03-09 07:36:53 +0000
commit72e940df2c24ab80056dfe296011c7a44ebdf3f0 (patch)
tree74dac84ccd51886de1dddeec3b73339e8872eb02 /app
parent69c1a9ae868593192d45642d3ad1550e057f877f (diff)
parentc6cd31edecdd0082b6cad865e38c6febd8cc75dd (diff)
downloadgitlab-ce-72e940df2c24ab80056dfe296011c7a44ebdf3f0.tar.gz
Merge branch 'change-activity-view-wording' into 'master'
Change activity view wording See merge request !9777
Diffstat (limited to 'app')
-rw-r--r--app/helpers/preferences_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/preferences_helper.rb b/app/helpers/preferences_helper.rb
index 710218082f2..243ef39ef61 100644
--- a/app/helpers/preferences_helper.rb
+++ b/app/helpers/preferences_helper.rb
@@ -36,7 +36,7 @@ module PreferencesHelper
def project_view_choices
[
['Files and Readme (default)', :files],
- ['Activity view', :activity]
+ ['Activity', :activity]
]
end