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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
27a6aa4f
Commit
27a6aa4f
authored
Jul 17, 2017
by
Bob Van Landuyt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move system-uploads to `-/system`
parent
11f9ac0a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
app/uploaders/gitlab_uploader.rb
app/uploaders/gitlab_uploader.rb
+1
-1
changelogs/unreleased/bvl-free-system-namespace.yml
changelogs/unreleased/bvl-free-system-namespace.yml
+4
-0
config/routes/uploads.rb
config/routes/uploads.rb
+2
-2
No files found.
app/uploaders/gitlab_uploader.rb
View file @
27a6aa4f
...
@@ -16,7 +16,7 @@ class GitlabUploader < CarrierWave::Uploader::Base
...
@@ -16,7 +16,7 @@ class GitlabUploader < CarrierWave::Uploader::Base
def
self
.
base_dir
def
self
.
base_dir
return
root_dir
unless
file_storage?
return
root_dir
unless
file_storage?
File
.
join
(
root_dir
,
'system'
)
File
.
join
(
root_dir
,
'
-'
,
'
system'
)
end
end
def
self
.
file_storage?
def
self
.
file_storage?
...
...
changelogs/unreleased/bvl-free-system-namespace.yml
0 → 100644
View file @
27a6aa4f
---
title
:
"
Move
uploads
from
`uploads/system`
to
`uploads/-/system`
to
free
up
`system`
as
a
group
name"
merge_request
:
11713
author
:
config/routes/uploads.rb
View file @
27a6aa4f
scope
path: :uploads
do
scope
path: :uploads
do
# Note attachments and User/Group/Project avatars
# Note attachments and User/Group/Project avatars
get
"system/:model/:mounted_as/:id/:filename"
,
get
"
-/
system/:model/:mounted_as/:id/:filename"
,
to:
"uploads#show"
,
to:
"uploads#show"
,
constraints:
{
model:
/note|user|group|project/
,
mounted_as:
/avatar|attachment/
,
filename:
/[^\/]+/
}
constraints:
{
model:
/note|user|group|project/
,
mounted_as:
/avatar|attachment/
,
filename:
/[^\/]+/
}
...
@@ -15,7 +15,7 @@ scope path: :uploads do
...
@@ -15,7 +15,7 @@ scope path: :uploads do
constraints:
{
filename:
/[^\/]+/
}
constraints:
{
filename:
/[^\/]+/
}
# Appearance
# Appearance
get
"system/:model/:mounted_as/:id/:filename"
,
get
"
-/
system/:model/:mounted_as/:id/:filename"
,
to:
"uploads#show"
,
to:
"uploads#show"
,
constraints:
{
model:
/appearance/
,
mounted_as:
/logo|header_logo/
,
filename:
/.+/
}
constraints:
{
model:
/appearance/
,
mounted_as:
/logo|header_logo/
,
filename:
/.+/
}
...
...
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