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
Jérome Perrin
gitlab-ce
Commits
4146e885
Commit
4146e885
authored
May 05, 2014
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix styling issues.
parent
cb69baed
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
8 deletions
+10
-8
app/controllers/projects/wikis_controller.rb
app/controllers/projects/wikis_controller.rb
+10
-8
No files found.
app/controllers/projects/wikis_controller.rb
View file @
4146e885
...
@@ -12,19 +12,21 @@ class Projects::WikisController < Projects::ApplicationController
...
@@ -12,19 +12,21 @@ class Projects::WikisController < Projects::ApplicationController
def
show
def
show
@page
=
@project_wiki
.
find_page
(
params
[
:id
],
params
[
:version_id
])
@page
=
@project_wiki
.
find_page
(
params
[
:id
],
params
[
:version_id
])
gollum_wiki
=
@project_wiki
.
wiki
file
=
gollum_wiki
.
file
(
params
[
:id
],
gollum_wiki
.
ref
,
true
)
if
@page
if
@page
render
'show'
render
'show'
elsif
file
=
@project_wiki
.
wiki
.
file
(
params
[
:id
],
@project_wiki
.
wiki
.
ref
,
true
)
elsif
file
if
file
.
on_disk?
if
file
.
on_disk?
send_file
file
.
on_disk_path
,
:disposition
=>
'inline'
send_file
file
.
on_disk_path
,
disposition:
'inline'
else
else
send_data
(
send_data
(
file
.
raw_data
,
file
.
raw_data
,
type:
file
.
mime_type
,
type:
file
.
mime_type
,
disposition:
'inline'
,
disposition:
'inline'
,
filename:
file
.
name
filename:
file
.
name
)
)
end
end
else
else
return
render
(
'empty'
)
unless
can?
(
current_user
,
:write_wiki
,
@project
)
return
render
(
'empty'
)
unless
can?
(
current_user
,
:write_wiki
,
@project
)
...
...
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