diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-10-20 17:12:23 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-10-20 17:12:23 +0200 |
| commit | e4008bc415c112db6b2200fb9c79431ad4ffbecc (patch) | |
| tree | ecedd7a4db93e1cdcebfed0c9afa194fbee30078 /app/helpers/preferences_helper.rb | |
| parent | a321404fde85fba6b09cbf1a56914f3a2ae555e4 (diff) | |
| parent | befff6827a2cf81f6565b99212652a70139aa2b6 (diff) | |
| download | gitlab-ce-git-archive-improvements-2.tar.gz | |
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-archive-improvements-2git-archive-improvements-2
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 |