diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-05 01:00:34 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-05 01:00:34 +0000 |
| commit | 31323205bcc3ed663e7a1c5be4c5e5bd5b9ec5a6 (patch) | |
| tree | 1bef04ba971e7d9feff2dcd13e39c690c7132987 | |
| parent | 3a533d48c634b0affd285832bd8dbc24435e19bc (diff) | |
| parent | d8cb235195cc70542d580842383d2697d5a5c5fd (diff) | |
| download | gitlab-ce-31323205bcc3ed663e7a1c5be4c5e5bd5b9ec5a6.tar.gz | |
Merge branch 'reserverd-project-names' into 'master'
Disable reserverd project names
Fixes #1550
See merge request !1471
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | app/models/project.rb | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 4698bb7bd8b..12d6f5830bf 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -29,7 +29,7 @@ v 7.8.0 - Fix commits pagination - - 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) - - diff --git a/app/models/project.rb b/app/models/project.rb index cfe40553ab5..390e1457ca1 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -116,7 +116,6 @@ class Project < ActiveRecord::Base validates :path, presence: true, length: { within: 0..255 }, - exclusion: { in: Gitlab::Blacklist.path }, format: { with: Gitlab::Regex.path_regex, message: Gitlab::Regex.path_regex_message } validates :issues_enabled, :merge_requests_enabled, |