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
e553c3b4
Commit
e553c3b4
authored
Jan 06, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dz-whitelist-some-project-names' into 'master'
Whitelist next project names: assets, profile, public See merge request !8470
parents
4c343310
3551a625
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
6 deletions
+5
-6
project_path_validator.rb
app/validators/project_path_validator.rb
+1
-1
dz-whitelist-some-project-names.yml
changelogs/unreleased/dz-whitelist-some-project-names.yml
+4
-0
20161221153951_rename_reserved_project_names.rb
...t_migrate/20161221153951_rename_reserved_project_names.rb
+0
-5
No files found.
app/validators/project_path_validator.rb
View file @
e553c3b4
...
...
@@ -15,7 +15,7 @@ class ProjectPathValidator < ActiveModel::EachValidator
# 'tree' as project name and 'deploy_keys' as route.
#
RESERVED
=
(
NamespaceValidator
::
RESERVED
-
%w[dashboard help ci admin search notes services]
+
%w[dashboard help ci admin search notes services
assets profile public
]
+
%w[tree commits wikis new edit create update logs_tree
preview blob blame raw files create_dir find_file]
).
freeze
...
...
changelogs/unreleased/dz-whitelist-some-project-names.yml
0 → 100644
View file @
e553c3b4
---
title
:
'
Whitelist
next
project
names:
assets,
profile,
public'
merge_request
:
8470
author
:
db/post_migrate/20161221153951_rename_reserved_project_names.rb
View file @
e553c3b4
...
...
@@ -10,7 +10,6 @@ class RenameReservedProjectNames < ActiveRecord::Migration
KNOWN_PATHS
=
%w(.well-known
all
assets
blame
blob
commits
...
...
@@ -18,7 +17,6 @@ class RenameReservedProjectNames < ActiveRecord::Migration
create_dir
edit
files
files
find_file
groups
hooks
...
...
@@ -26,11 +24,8 @@ class RenameReservedProjectNames < ActiveRecord::Migration
logs_tree
merge_requests
new
new
preview
profile
projects
public
raw
repository
robots.txt
...
...
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