BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
e7f29e78
Commit
e7f29e78
authored
Mar 16, 2017
by
Rémy Coutable
Committed by
Lin Jen-Shin
Mar 16, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge branch 'fix-project-without-repo-and-wiki' into 'master'
Fix projects without repo and wiki Closes #29542 See merge request !9956
parent
fa004fad
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
projects_controller.rb
app/controllers/projects_controller.rb
+3
-2
projects_controller_spec.rb
spec/controllers/projects_controller_spec.rb
+2
-0
No files found.
app/controllers/projects_controller.rb
View file @
e7f29e78
...
...
@@ -267,8 +267,9 @@ class ProjectsController < Projects::ApplicationController
@project_wiki
=
@project
.
wiki
@wiki_home
=
@project_wiki
.
find_page
(
'home'
,
params
[
:version_id
])
elsif
@project
.
feature_available?
(
:issues
,
current_user
)
@issues
=
issues_collection
@issues
=
@issues
.
page
(
params
[
:page
])
@issues
=
issues_collection
.
page
(
params
[
:page
])
@collection_type
=
'Issue'
@issuable_meta_data
=
issuable_meta_data
(
@issues
,
@collection_type
)
end
render
:show
...
...
spec/controllers/projects_controller_spec.rb
View file @
e7f29e78
...
...
@@ -78,10 +78,12 @@ describe ProjectsController do
it
'shows issues list page if wiki is disabled'
do
project
.
project_feature
.
update_attribute
(
:wiki_access_level
,
ProjectFeature
::
DISABLED
)
create
(
:issue
,
project:
project
)
get
:show
,
namespace_id:
project
.
namespace
,
id:
project
expect
(
response
).
to
render_template
(
'projects/issues/_issues'
)
expect
(
assigns
(
:issuable_meta_data
)).
not_to
be_nil
end
it
'shows customize workflow page if wiki and issues are disabled'
do
...
...
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