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

[rails.git] / db / migrate / 20120318201948_create_redactions.rb

diff --git a/db/migrate/20120318201948_create_redactions.rb b/db/migrate/20120318201948_create_redactions.rb
index bb9786db45f65bd849bba5a934eb37517108439b..e108ea84b060337b6a5097d09f0bf9782b945ab1 100644 (file)
--- a/db/migrate/20120318201948_create_redactions.rb
+++ b/db/migrate/20120318201948_create_redactions.rb
@@ -1,12 +1,12 @@
 require "migrate"
 
-class CreateRedactions < ActiveRecord::Migration
+class CreateRedactions < ActiveRecord::Migration[4.2]
   def change
     create_table :redactions do |t|
       t.string :title
       t.text :description
 
-      t.timestamps
+      t.timestamps :null => true
     end
 
     [:nodes, :ways, :relations].each do |tbl|