diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-10-19 11:34:48 +0200 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-10-19 11:34:48 +0200 |
commit | 7ae139566b46050b31bf01a6302af560fc129819 (patch) | |
tree | cc342c422373d89d12aa763a8a924d241192b4a1 /app/helpers/preferences_helper.rb | |
parent | a32f7766098bf38b1028168b4919516460a562e9 (diff) | |
parent | 8adeda37b55fc992e3cb15422cae5d9646640630 (diff) | |
download | gitlab-ce-full-width-tables.tar.gz |
Merge branch 'master' into full-width-tablesfull-width-tables
Diffstat (limited to 'app/helpers/preferences_helper.rb')
-rw-r--r-- | app/helpers/preferences_helper.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/helpers/preferences_helper.rb b/app/helpers/preferences_helper.rb index 4710171ebaa..c73cb3028ee 100644 --- a/app/helpers/preferences_helper.rb +++ b/app/helpers/preferences_helper.rb @@ -34,7 +34,8 @@ module PreferencesHelper def project_view_choices [ ['Readme (default)', :readme], - ['Activity view', :activity] + ['Activity view', :activity], + ['Files view', :files] ] end @@ -46,8 +47,7 @@ module PreferencesHelper Gitlab::ColorSchemes.for_user(current_user).css_class end - def prefer_readme? - !current_user || - current_user.project_view == 'readme' + def default_project_view + current_user ? current_user.project_view : 'readme' end end |