diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-19 09:27:37 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-19 09:27:37 +0000 |
commit | a148c06cf8cba7d34929e4517180c952328964e9 (patch) | |
tree | 54bc4f324e9a9badf678f4bd9527754bcae5628c /app/helpers | |
parent | 5292b09f95c59cb08bcd8c04ae26128b60a5e5f7 (diff) | |
parent | f52b07cedcafc6cb5e92f549b7e7b4fab3b2ca83 (diff) | |
download | gitlab-ce-a148c06cf8cba7d34929e4517180c952328964e9.tar.gz |
Merge branch 'cristianbica/gitlab-ce-user-project-view-files' into 'master'
Allow users to select the Files view as default project view
![Screen_Shot_2015-10-17_at_19.24.01](/uploads/c3194db856f5e5e1b3493302c0a479a5/Screen_Shot_2015-10-17_at_19.24.01.png)
Also shows the readme at the very bottom, like on the regular Files page.
Replaces !1489.
Closes #2655.
See merge request !1632
Diffstat (limited to 'app/helpers')
-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 |