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
Kazuhiko Shiozaki
gitlab-ce
Commits
938a1381
Commit
938a1381
authored
Feb 20, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Satisfy Rubocop.
parent
73d12d6e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
7 deletions
+9
-7
app/controllers/projects/uploads_controller.rb
app/controllers/projects/uploads_controller.rb
+1
-1
config/initializers/static_files.rb
config/initializers/static_files.rb
+1
-1
config/routes.rb
config/routes.rb
+6
-4
lib/gitlab/middleware/static.rb
lib/gitlab/middleware/static.rb
+1
-1
No files found.
app/controllers/projects/uploads_controller.rb
View file @
938a1381
...
@@ -16,4 +16,4 @@ class Projects::UploadsController < Projects::ApplicationController
...
@@ -16,4 +16,4 @@ class Projects::UploadsController < Projects::ApplicationController
not_found!
not_found!
end
end
end
end
end
end
\ No newline at end of file
config/initializers/static_files.rb
View file @
938a1381
...
@@ -10,4 +10,4 @@ begin
...
@@ -10,4 +10,4 @@ begin
rescue
rescue
# If ActionDispatch::Static wasn't loaded onto the stack (like in production),
# If ActionDispatch::Static wasn't loaded onto the stack (like in production),
# an exception is raised.
# an exception is raised.
end
end
\ No newline at end of file
config/routes.rb
View file @
938a1381
...
@@ -75,12 +75,14 @@ Gitlab::Application.routes.draw do
...
@@ -75,12 +75,14 @@ Gitlab::Application.routes.draw do
scope
path: :uploads
do
scope
path: :uploads
do
# Note attachments and User/Group/Project avatars
# Note attachments and User/Group/Project avatars
get
":model/:mounted_as/:id/:filename"
,
to:
"uploads#show"
,
get
":model/:mounted_as/:id/:filename"
,
constraints:
{
model:
/note|user|group|project/
,
mounted_as:
/avatar|attachment/
,
filename:
/.+/
}
to:
"uploads#show"
,
constraints:
{
model:
/note|user|group|project/
,
mounted_as:
/avatar|attachment/
,
filename:
/.+/
}
# Project markdown uploads
# Project markdown uploads
get
":id/:secret/:filename"
,
to:
"projects/uploads#show"
,
get
":id/:secret/:filename"
,
constraints:
{
id:
/[a-zA-Z.0-9_\-]+\/[a-zA-Z.0-9_\-]+/
,
filename:
/.+/
}
to:
"projects/uploads#show"
,
constraints:
{
id:
/[a-zA-Z.0-9_\-]+\/[a-zA-Z.0-9_\-]+/
,
filename:
/.+/
}
end
end
#
#
...
...
lib/gitlab/middleware/static.rb
View file @
938a1381
...
@@ -10,4 +10,4 @@ module Gitlab
...
@@ -10,4 +10,4 @@ module Gitlab
end
end
end
end
end
end
end
end
\ No newline at end of file
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