diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-03-07 07:57:33 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-03-07 07:57:33 +0000 |
| commit | 81aec00d6172fbc67d0e11ea262ebd6019bf4539 (patch) | |
| tree | df9c96df9903b492bd11186052f06b3bc5956a1f | |
| parent | 6b2d4947a6300f006fd46360161687fd19e18659 (diff) | |
| parent | 1565d7f6e602258c587bfa0e5606f671b14b7e3c (diff) | |
| download | gitlab-ce-81aec00d6172fbc67d0e11ea262ebd6019bf4539.tar.gz | |
Merge branch 'remove-readme-option' into 'master'
Remove readme-only project view preference
See merge request !9744
| -rw-r--r-- | app/helpers/preferences_helper.rb | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/remove-readme-option.yml | 4 | ||||
| -rw-r--r-- | spec/controllers/projects_controller_spec.rb | 8 |
3 files changed, 6 insertions, 11 deletions
diff --git a/app/helpers/preferences_helper.rb b/app/helpers/preferences_helper.rb index 74cccb23956..710218082f2 100644 --- a/app/helpers/preferences_helper.rb +++ b/app/helpers/preferences_helper.rb @@ -35,9 +35,8 @@ module PreferencesHelper def project_view_choices [ - ['Readme', :readme], - ['Activity view', :activity], - ['Files and Readme (default)', :files] + ['Files and Readme (default)', :files], + ['Activity view', :activity] ] end diff --git a/changelogs/unreleased/remove-readme-option.yml b/changelogs/unreleased/remove-readme-option.yml new file mode 100644 index 00000000000..1d4c862c00e --- /dev/null +++ b/changelogs/unreleased/remove-readme-option.yml @@ -0,0 +1,4 @@ +--- +title: Remove readme-only project view preference +merge_request: +author: diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb index 202759664a0..a1ec41322ad 100644 --- a/spec/controllers/projects_controller_spec.rb +++ b/spec/controllers/projects_controller_spec.rb @@ -158,14 +158,6 @@ describe ProjectsController do expect(response).to render_template('_activity') end - it "renders the readme view" do - allow(controller).to receive(:current_user).and_return(user) - allow(user).to receive(:project_view).and_return('readme') - - get :show, namespace_id: public_project.namespace, id: public_project - expect(response).to render_template('_readme') - end - it "renders the files view" do allow(controller).to receive(:current_user).and_return(user) allow(user).to receive(:project_view).and_return('files') |