Skip to content

G
gitlab-ce
Commit 31323205 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files
Options

Merge branch 'reserverd-project-names' into 'master' 

Disable reserverd project names

Fixes #1550

See merge request !1471
parents 3a533d48 d8cb2351
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
CHANGELOG
View file @ 31323205
...@@ -29,7 +29,7 @@ v 7.8.0 ...@@ -29,7 +29,7 @@ v 7.8.0
- Fix commits pagination - Fix commits pagination
- -
- Async load a branch information at the commit page - Async load a branch information at the commit page
- - Disable blacklist validation for project names
- Allow configuring protection of the default branch upon first push (Marco Wessel) - Allow configuring protection of the default branch upon first push (Marco Wessel)
- -
- -
......
app/models/project.rb
View file @ 31323205
...@@ -116,7 +116,6 @@ class Project < ActiveRecord::Base ...@@ -116,7 +116,6 @@ class Project < ActiveRecord::Base
validates :path, validates :path,
presence: true, presence: true,
length: { within: 0..255 }, length: { within: 0..255 },
exclusion: { in: Gitlab::Blacklist.path },
format: { with: Gitlab::Regex.path_regex, format: { with: Gitlab::Regex.path_regex,
message: Gitlab::Regex.path_regex_message } message: Gitlab::Regex.path_regex_message }
validates :issues_enabled, :merge_requests_enabled, validates :issues_enabled, :merge_requests_enabled,
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7