Merge remote-tracking branch 'origin/master'

SpeciesFileGroup · Feb 26, 2014 · afc2cd6 · afc2cd6
2 parents 1488e8d + ac7be2e
commit afc2cd6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/db/migrate/20140203204557_create_versions.rb b/db/migrate/20140203204557_create_versions.rb
@@ -5,7 +5,7 @@ def self.up
       t.integer  :item_id,   :null => false
       t.string   :event,     :null => false
       t.string   :whodunnit
-      t.text     :geo_object
+      t.text     :object
       t.datetime :created_at
     end
     add_index :versions, [:item_type, :item_id]

diff --git a/spec/models/content_spec.rb b/spec/models/content_spec.rb
@@ -69,7 +69,7 @@
       expect(PaperTrail).to be_enabled
     end
 
-    context 'some Paptertrail methods' do
+    context 'some Papertrail methods' do
       before(:each) {
         @c = FactoryGirl.build(:valid_content)
         @c.save!