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
7c3147e6
Commit
7c3147e6
authored
Feb 19, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Nitpicking."
This reverts commit
ebd39fc0
.
parent
3c2139ed
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
app/controllers/files_controller.rb
app/controllers/files_controller.rb
+2
-3
No files found.
app/controllers/files_controller.rb
View file @
7c3147e6
...
@@ -5,10 +5,9 @@ class FilesController < ApplicationController
...
@@ -5,10 +5,9 @@ class FilesController < ApplicationController
if
uploader
.
file_storage?
if
uploader
.
file_storage?
if
can?
(
current_user
,
:read_project
,
note
.
project
)
if
can?
(
current_user
,
:read_project
,
note
.
project
)
# Replace old notes location in /public with the new one in / and send the file
path
=
uploader
.
file
.
path
.
gsub
(
"
#{
Rails
.
root
}
/public"
,
Rails
.
root
.
to_s
)
disposition
=
uploader
.
image?
?
'inline'
:
'attachment'
disposition
=
uploader
.
image?
?
'inline'
:
'attachment'
# Replace old notes location in /public with the new one in / and send the file
path
=
uploader
.
file
.
path
.
gsub
(
"
#{
Rails
.
root
}
/public"
,
Rails
.
root
.
to_s
)
send_file
path
,
disposition:
disposition
send_file
path
,
disposition:
disposition
else
else
not_found!
not_found!
...
...
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