Commit e553c3b4 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'dz-whitelist-some-project-names' into 'master'

Whitelist next project names: assets, profile, public

See merge request !8470
parents 4c343310 3551a625
...@@ -15,7 +15,7 @@ class ProjectPathValidator < ActiveModel::EachValidator ...@@ -15,7 +15,7 @@ class ProjectPathValidator < ActiveModel::EachValidator
# 'tree' as project name and 'deploy_keys' as route. # 'tree' as project name and 'deploy_keys' as route.
# #
RESERVED = (NamespaceValidator::RESERVED - 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 %w[tree commits wikis new edit create update logs_tree
preview blob blame raw files create_dir find_file]).freeze preview blob blame raw files create_dir find_file]).freeze
......
---
title: 'Whitelist next project names: assets, profile, public'
merge_request: 8470
author:
...@@ -10,7 +10,6 @@ class RenameReservedProjectNames < ActiveRecord::Migration ...@@ -10,7 +10,6 @@ class RenameReservedProjectNames < ActiveRecord::Migration
KNOWN_PATHS = %w(.well-known KNOWN_PATHS = %w(.well-known
all all
assets
blame blame
blob blob
commits commits
...@@ -18,7 +17,6 @@ class RenameReservedProjectNames < ActiveRecord::Migration ...@@ -18,7 +17,6 @@ class RenameReservedProjectNames < ActiveRecord::Migration
create_dir create_dir
edit edit
files files
files
find_file find_file
groups groups
hooks hooks
...@@ -26,11 +24,8 @@ class RenameReservedProjectNames < ActiveRecord::Migration ...@@ -26,11 +24,8 @@ class RenameReservedProjectNames < ActiveRecord::Migration
logs_tree logs_tree
merge_requests merge_requests
new new
new
preview preview
profile
projects projects
public
raw raw
repository repository
robots.txt robots.txt
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment