Merge branch 'master' into overpass

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

diff --git a/app/models/tracetag.rb b/app/models/tracetag.rb
index f9833e141446125128a07ab5e03a6c21ba2f9bde..00f195e69a1323b47448d2114c69b563f4dd4f96 100644 (file)
--- a/app/models/tracetag.rb
+++ b/app/models/tracetag.rb
@@ -1,7 +1,7 @@
 class Tracetag < ActiveRecord::Base
-  set_table_name 'gpx_file_tags'
+  self.table_name = "gpx_file_tags"
 
-  validates_format_of :tag, :with => /^[^\/;.,?]*$/
+  validates_format_of :tag, :with => /\A[^\/;.,?]*\z/
   validates_length_of :tag, :within => 1..255
 
   belongs_to :trace, :foreign_key => 'gpx_id'