summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-02-28 17:08:46 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-03-03 10:24:06 +0200
commitb3971d0f213d1fe8129111009ec69076f7fb4233 (patch)
tree67f4c165c691bd3677ce1a04a1758e2e22e85ee2
parentb18646040c9b17c69ac66fb687b02450e161808c (diff)
downloadgitlab-ce-dz-change-project-view.tar.gz
Change default project view for user from readme to files viewdz-change-project-view
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/helpers/preferences_helper.rb4
-rw-r--r--app/models/user.rb1
-rw-r--r--changelogs/unreleased/dz-change-project-view.yml4
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: