Merge branch 'master' into 'ce-to-ee'

# Conflicts:
#   app/helpers/preferences_helper.rb

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
 

changelogs/unreleased/remove-readme-option.yml

+---
+title: Remove readme-only project view preference
+merge_request:
+author:

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')