Merge branch 'master' of github.com:WebEcologyProject/140kit

WebEcologyProject · Jul 10, 2010 · f5353c1 · f5353c1
2 parents f4353b5 + 45af4a0
commit f5353c1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/front-end/db/migrate/20100710005447_create_core_database.rb b/front-end/db/migrate/20100710005447_create_core_database.rb
@@ -210,8 +210,8 @@ def self.up
         t.integer :researcher_id
         t.string :name, :default => "A default Scrape Name"
         t.integer :length
-        t.datetime :created_at, :default => '2010-01-01 01:01:01'
-        t.datetime :updated_at, :default => '2010-01-01 01:01:01'
+        t.datetime :created_at
+        t.datetime :updated_at
         t.boolean :finished, :default =>false
         t.boolean :scrape_finished, :default =>false
         t.string :folder_name

diff --git a/front-end/db/schema.rb b/front-end/db/schema.rb
@@ -228,8 +228,8 @@
     t.integer  "researcher_id"
     t.string   "name",                  :default => "A default Scrape Name"
     t.integer  "length"
-    t.datetime "created_at",            :default => '2010-01-01 01:01:01'
-    t.datetime "updated_at",            :default => '2010-01-01 01:01:01'
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.boolean  "finished",              :default => false
     t.boolean  "scrape_finished",       :default => false
     t.string   "folder_name"