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

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

diff --git a/app/models/tracetag.rb b/app/models/tracetag.rb
index d4298f9df24adfda803382664432693fc0015254..8d2f4ffface4d307c0d1013ec212781010c8879d 100644 (file)
--- a/app/models/tracetag.rb
+++ b/app/models/tracetag.rb
@@ -1,8 +1,26 @@
+# == Schema Information
+#
+# Table name: gpx_file_tags
+#
+#  gpx_id :bigint(8)        default(0), not null
+#  tag    :string           not null
+#  id     :bigint(8)        not null, primary key
+#
+# Indexes
+#
+#  gpx_file_tags_gpxid_idx  (gpx_id)
+#  gpx_file_tags_tag_idx    (tag)
+#
+# Foreign Keys
+#
+#  gpx_file_tags_gpx_id_fkey  (gpx_id => gpx_files.id)
+#
+
 class Tracetag < ActiveRecord::Base
   self.table_name = "gpx_file_tags"
 
   belongs_to :trace, :foreign_key => "gpx_id"
 
   validates :trace, :associated => true
-  validates :tag, :length => 1..255, :format => /\A[^\/;.,?]*\z/
+  validates :tag, :length => 1..255, :characters => { :url_safe => true }
 end