Merge branch 'fix-migrations-from-merge-revert' into 'master'

fix merge revert

See merge request saburly/gangsta/roraccounting!22

db/migrate/20200918012614_remove_default_chip_from_homies.rb

@@ -0,0 +1,5 @@
+class RemoveDefaultChipFromHomies < ActiveRecord::Migration[5.2]
+  def change
+    remove_reference :homies, :chip
+  end
+end

db/migrate/20200918032033_create_ogs.rb

@@ -0,0 +1,13 @@
+class CreateOgs < ActiveRecord::Migration[5.2]
+  def change
+    create_table :ogs do |t|
+      t.text :chip_name
+      t.text :chip_code
+      t.text :chip_symbol
+      t.boolean :chip_prefixed
+      t.integer :chip_scale
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20201006103218_remove_ogs.rb

@@ -0,0 +1,5 @@
+class RemoveOgs < ActiveRecord::Migration[5.2]
+  def change
+    drop_table :ogs
+  end
+end

db/migrate/20201006103421_add_default_chip_ref_to_homies.rb

@@ -0,0 +1,5 @@
+class AddDefaultChipRefToHomies < ActiveRecord::Migration[5.2]
+  def change
+    add_reference :homies, :chip
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_09_19_023237) do
+ActiveRecord::Schema.define(version: 2020_10_06_103421) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"