diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-03-04 10:48:29 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-03-04 10:48:29 +0000 |
| commit | d6733662da689378463f9abf62532e9d09a59739 (patch) | |
| tree | a00a0b77a47d8e4b4125813d53746e1e0cb2874d | |
| parent | ce55e6e8a39847f6f76999aafb1ca4de33347b0b (diff) | |
| parent | b3971d0f213d1fe8129111009ec69076f7fb4233 (diff) | |
| download | gitlab-ce-d6733662da689378463f9abf62532e9d09a59739.tar.gz | |
Merge branch 'dz-change-project-view' into 'master'
Change default project view for user from readme to files view
See merge request !9584
| -rw-r--r-- | app/helpers/preferences_helper.rb | 4 | ||||
| -rw-r--r-- | app/models/user.rb | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/dz-change-project-view.yml | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/app/helpers/preferences_helper.rb b/app/helpers/preferences_helper.rb index c3a08d76318..74cccb23956 100644 --- a/app/helpers/preferences_helper.rb +++ b/app/helpers/preferences_helper.rb @@ -35,9 +35,9 @@ module PreferencesHelper def project_view_choices [ - ['Readme (default)', :readme], + ['Readme', :readme], ['Activity view', :activity], - ['Files view', :files] + ['Files and Readme (default)', :files] ] end diff --git a/app/models/user.rb b/app/models/user.rb index 8443594c055..d3bb04060bf 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -21,6 +21,7 @@ class User < ActiveRecord::Base default_value_for :can_create_team, false default_value_for :hide_no_ssh_key, false default_value_for :hide_no_password, false + default_value_for :project_view, :files attr_encrypted :otp_secret, key: Gitlab::Application.secrets.otp_key_base, diff --git a/changelogs/unreleased/dz-change-project-view.yml b/changelogs/unreleased/dz-change-project-view.yml new file mode 100644 index 00000000000..47e007a80a8 --- /dev/null +++ b/changelogs/unreleased/dz-change-project-view.yml @@ -0,0 +1,4 @@ +--- +title: Change default project view for user from readme to files view +merge_request: 9584 +author: |