Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
1565d7f6
Commit
1565d7f6
authored
Mar 06, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove readme-only project view preference
parent
b70d151d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
11 deletions
+6
-11
app/helpers/preferences_helper.rb
app/helpers/preferences_helper.rb
+2
-3
changelogs/unreleased/remove-readme-option.yml
changelogs/unreleased/remove-readme-option.yml
+4
-0
spec/controllers/projects_controller_spec.rb
spec/controllers/projects_controller_spec.rb
+0
-8
No files found.
app/helpers/preferences_helper.rb
View file @
1565d7f6
...
@@ -35,9 +35,8 @@ module PreferencesHelper
...
@@ -35,9 +35,8 @@ module PreferencesHelper
def
project_view_choices
def
project_view_choices
[
[
[
'Readme'
,
:readme
],
[
'Files and Readme (default)'
,
:files
],
[
'Activity view'
,
:activity
],
[
'Activity view'
,
:activity
]
[
'Files and Readme (default)'
,
:files
]
]
]
end
end
...
...
changelogs/unreleased/remove-readme-option.yml
0 → 100644
View file @
1565d7f6
---
title
:
Remove readme-only project view preference
merge_request
:
author
:
spec/controllers/projects_controller_spec.rb
View file @
1565d7f6
...
@@ -158,14 +158,6 @@ describe ProjectsController do
...
@@ -158,14 +158,6 @@ describe ProjectsController do
expect
(
response
).
to
render_template
(
'_activity'
)
expect
(
response
).
to
render_template
(
'_activity'
)
end
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
it
"renders the files view"
do
allow
(
controller
).
to
receive
(
:current_user
).
and_return
(
user
)
allow
(
controller
).
to
receive
(
:current_user
).
and_return
(
user
)
allow
(
user
).
to
receive
(
:project_view
).
and_return
(
'files'
)
allow
(
user
).
to
receive
(
:project_view
).
and_return
(
'files'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment