summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-07-05 20:21:58 +0000
committerDouwe Maan <douwe@gitlab.com>2017-07-05 20:21:58 +0000
commit793ce6fef635bc405f47b58e4b62bf1d48ca5078 (patch)
tree2150ae3278dfede986d967ef131dbfa4ba7cfc0b /app
parentacb748a6732345b98c14dd1eb95ce3959abda754 (diff)
parent1207d451ed934f3ce2d8c02130a8e6b2cac88a70 (diff)
downloadgitlab-ce-793ce6fef635bc405f47b58e4b62bf1d48ca5078.tar.gz
Merge branch '32408-allow-creation-of-files-and-dirs-with-spaces-in-web-ui' into 'master'
Make filename and path creation compatible with UNIX in web UI Closes #21362 See merge request !12608
Diffstat (limited to 'app')
-rw-r--r--app/models/snippet.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index 54014df43b0..b3aa7bb986e 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -37,9 +37,7 @@ class Snippet < ActiveRecord::Base
validates :author, presence: true
validates :title, presence: true, length: { maximum: 255 }
validates :file_name,
- length: { maximum: 255 },
- format: { with: Gitlab::Regex.file_name_regex,
- message: Gitlab::Regex.file_name_regex_message }
+ length: { maximum: 255 }
validates :content, presence: true
validates :visibility_level, inclusion: { in: Gitlab::VisibilityLevel.values }