Commit 0f6d2ca8 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'remove-readme-option-ee' into 'master'

Port of remove-readme-option to EE

See merge request !1368
parents b1fae0e5 d9df908e
......@@ -35,9 +35,8 @@ module PreferencesHelper
def project_view_choices
[
['Readme (default)', :readme],
['Activity view', :activity],
['Files view', :files]
['Files and Readme (default)', :files],
['Activity view', :activity]
]
end
......
---
title: Remove readme-only project view preference
merge_request:
author:
......@@ -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')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment