summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-06-20 10:47:06 +0000
committerDouwe Maan <douwe@gitlab.com>2015-06-20 10:47:06 +0000
commitc0df5ff126f3a2643ce804e85f09567709eec085 (patch)
treea2ed64d9b3f285fe127182174132c88138361112 /app/models
parent473fb23afc515b808c8687d17ead10cd7979082c (diff)
parentaecc989154ccb3cf044cff0341c0b7c195a9a572 (diff)
downloadgitlab-ce-c0df5ff126f3a2643ce804e85f09567709eec085.tar.gz
Merge branch 'snippet_optional_filename' into 'master'
Make snippet filename optional. Fixes #2384. See merge request !1866
Diffstat (limited to 'app/models')
-rw-r--r--app/models/snippet.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index 3ab9e834c63..b0831982aa7 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -34,7 +34,6 @@ class Snippet < ActiveRecord::Base
validates :author, presence: true
validates :title, presence: true, length: { within: 0..255 }
validates :file_name,
- presence: true,
length: { within: 0..255 },
format: { with: Gitlab::Regex.file_name_regex,
message: Gitlab::Regex.file_name_regex_message }