Merge migrations

db/migrate/20181129203927_devise_create_users.rb

@@ -35,6 +35,9 @@ class DeviseCreateUsers < ActiveRecord::Migration[5.2]
 
       t.string :english_name, null: false, index: { unique: true }
       t.string :native_name,  null: false, index: { unique: true }
+
+      t.integer  :number,   null: false, index: { unique: true }
+      t.interval :timezone, null: false, index: false
     end
 
     create_table :regional_offices do |t|

db/migrate/20190719224405_add_number_to_federal_subjects.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-class AddNumberToFederalSubjects < ActiveRecord::Migration[6.0]
-  def change
-    # rubocop:disable Rails/NotNullColumn
-    add_column :federal_subjects, :number, :integer, null: false
-    add_index  :federal_subjects, :number, unique: true
-    # rubocop:enable Rails/NotNullColumn
-  end
-end

db/migrate/20190720022446_add_timezone_to_federal_subjects.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class AddTimezoneToFederalSubjects < ActiveRecord::Migration[6.0]
-  def change
-    # rubocop:disable Rails/NotNullColumn
-    add_column :federal_subjects, :timezone, :interval, null: false
-    # rubocop:enable Rails/NotNullColumn
-  end
-end

db/structure.sql

@@ -1140,9 +1140,6 @@ SET search_path TO "$user", public;
 INSERT INTO "schema_migrations" (version) VALUES
 ('20181129203927'),
 ('20181130024918'),
-('20190427141639'),
-('20190719224405'),
-('20190720022446'),
 ('20190720042127'),
 ('20190720124758');