Merge remote-tracking branch 'upstream/pull/2225'

[rails.git] / app / models / tracetag.rb

diff --git a/app/models/tracetag.rb b/app/models/tracetag.rb
index cb7cf1145814ef7dd7a9fa400510fa76956cdb5c..8d2f4ffface4d307c0d1013ec212781010c8879d 100644 (file)
--- a/app/models/tracetag.rb
+++ b/app/models/tracetag.rb
@@ -22,5 +22,5 @@ class Tracetag < ActiveRecord::Base
   belongs_to :trace, :foreign_key => "gpx_id"
 
   validates :trace, :associated => true
-  validates :tag, :length => 1..255, :format => %r{\A[^/;.,?]*\z}, :invalid_chars => true
+  validates :tag, :length => 1..255, :characters => { :url_safe => true }
 end