upgrade rails and supporting gems, refresh schema

Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-gem 'rails', '= 5.1.6'
+gem 'rails', '= 5.2.1'
 gem 'mysql2', '>= 0.3.18', '< 0.5'
 gem 'puma', '~> 3.0'
 gem 'turbolinks', '~> 5'

Gemfile.lock

@@ -1,60 +1,64 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    acme-client (0.6.2)
+    acme-client (2.0.0)
       faraday (~> 0.9, >= 0.9.1)
-    actioncable (5.1.6)
+    actioncable (5.2.1)
-      actionpack (= 5.1.6)
+      actionpack (= 5.2.1)
       nio4r (~> 2.0)
-      websocket-driver (~> 0.6.1)
+      websocket-driver (>= 0.6.1)
-    actionmailer (5.1.6)
+    actionmailer (5.2.1)
-      actionpack (= 5.1.6)
+      actionpack (= 5.2.1)
-      actionview (= 5.1.6)
+      actionview (= 5.2.1)
-      activejob (= 5.1.6)
+      activejob (= 5.2.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.6)
+    actionpack (5.2.1)
-      actionview (= 5.1.6)
+      actionview (= 5.2.1)
-      activesupport (= 5.1.6)
+      activesupport (= 5.2.1)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.6)
+    actionview (5.2.1)
-      activesupport (= 5.1.6)
+      activesupport (= 5.2.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.6)
+    activejob (5.2.1)
-      activesupport (= 5.1.6)
+      activesupport (= 5.2.1)
       globalid (>= 0.3.6)
-    activemodel (5.1.6)
+    activemodel (5.2.1)
-      activesupport (= 5.1.6)
+      activesupport (= 5.2.1)
-    activerecord (5.1.6)
+    activerecord (5.2.1)
-      activemodel (= 5.1.6)
+      activemodel (= 5.2.1)
-      activesupport (= 5.1.6)
+      activesupport (= 5.2.1)
-      arel (~> 8.0)
+      arel (>= 9.0)
-    activesupport (5.1.6)
+    activestorage (5.2.1)
+      actionpack (= 5.2.1)
+      activerecord (= 5.2.1)
+      marcel (~> 0.3.1)
+    activesupport (5.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     amq-protocol (2.3.0)
-    annotate (2.7.2)
+    annotate (2.7.4)
       activerecord (>= 3.2, < 6.0)
       rake (>= 10.4, < 13.0)
-    arel (8.0.0)
+    arel (9.0.0)
-    authie (3.1.0)
+    authie (3.1.5)
-    autoprefixer-rails (8.0.0)
+    autoprefixer-rails (9.1.3)
       execjs
     basic_ssl (1.0.3)
-    bcrypt (3.1.11)
+    bcrypt (3.1.12)
     bson (4.3.0)
     builder (3.2.3)
     bunny (2.5.1)
       amq-protocol (>= 2.0.1)
-    byebug (10.0.0)
+    byebug (10.0.2)
     changey (1.0.0)
       activerecord (>= 4.2, < 6)
     chronic (0.10.2)
@@ -73,7 +77,7 @@ GEM
       hashie (~> 3.0)
       httparty (~> 0.14)
       json (>= 1.0)
-    database_cleaner (1.6.2)
+    database_cleaner (1.7.0)
     deep_merge (1.2.1)
     diff-lcs (1.3)
     dynamic_form (1.1.4)
@@ -85,10 +89,10 @@ GEM
     factory_girl_rails (4.9.0)
       factory_girl (~> 4.9.0)
       railties (>= 3.0.0)
-    faraday (0.14.0)
+    faraday (0.15.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.21)
+    ffi (1.9.25)
-    foreman (0.84.0)
+    foreman (0.85.0)
       thor (~> 0.19.1)
     gelf (3.0.0)
       json
@@ -97,13 +101,13 @@ GEM
     haml (5.0.4)
       temple (>= 0.8.0)
       tilt
-    hashie (3.5.7)
+    hashie (3.6.0)
-    highline (1.7.10)
+    highline (2.0.0)
-    httparty (0.16.0)
+    httparty (0.16.2)
       multi_xml (>= 0.5.2)
-    i18n (1.0.1)
+    i18n (1.1.0)
       concurrent-ruby (~> 1.0)
-    jquery-rails (4.3.1)
+    jquery-rails (4.3.3)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -126,11 +130,14 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.7.0)
       mini_mime (>= 0.1.1)
+    marcel (0.3.2)
+      mimemagic (~> 0.3.2)
     method_source (0.9.0)
-    mini_mime (1.0.0)
+    mimemagic (0.3.2)
+    mini_mime (1.0.1)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
-    mongo (2.5.0)
+    mongo (2.6.2)
       bson (>= 4.3.0, < 5.0.0)
     moonrope (2.0.1)
       deep_merge (~> 1.0)
@@ -144,61 +151,62 @@ GEM
       activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
     nio4r (2.3.1)
-    nokogiri (1.8.3)
+    nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
-    puma (3.11.2)
+    puma (3.12.0)
     rack (2.0.5)
-    rack-test (1.0.0)
+    rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.1.6)
+    rails (5.2.1)
-      actioncable (= 5.1.6)
+      actioncable (= 5.2.1)
-      actionmailer (= 5.1.6)
+      actionmailer (= 5.2.1)
-      actionpack (= 5.1.6)
+      actionpack (= 5.2.1)
-      actionview (= 5.1.6)
+      actionview (= 5.2.1)
-      activejob (= 5.1.6)
+      activejob (= 5.2.1)
-      activemodel (= 5.1.6)
+      activemodel (= 5.2.1)
-      activerecord (= 5.1.6)
+      activerecord (= 5.2.1)
-      activesupport (= 5.1.6)
+      activestorage (= 5.2.1)
+      activesupport (= 5.2.1)
       bundler (>= 1.3.0)
-      railties (= 5.1.6)
+      railties (= 5.2.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    railties (5.1.6)
+    railties (5.2.1)
-      actionpack (= 5.1.6)
+      actionpack (= 5.2.1)
-      activesupport (= 5.1.6)
+      activesupport (= 5.2.1)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
+      thor (>= 0.19.0, < 2.0)
     rake (12.3.1)
-    rb-fsevent (0.10.2)
+    rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    rspec (3.7.0)
+    rspec (3.8.0)
-      rspec-core (~> 3.7.0)
+      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.7.0)
+      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.7.0)
+      rspec-mocks (~> 3.8.0)
-    rspec-core (3.7.1)
+    rspec-core (3.8.0)
-      rspec-support (~> 3.7.0)
+      rspec-support (~> 3.8.0)
-    rspec-expectations (3.7.0)
+    rspec-expectations (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
+      rspec-support (~> 3.8.0)
-    rspec-mocks (3.7.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
+      rspec-support (~> 3.8.0)
-    rspec-rails (3.7.2)
+    rspec-rails (3.8.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.7.0)
+      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.7.0)
+      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.7.0)
+      rspec-mocks (~> 3.8.0)
-      rspec-support (~> 3.7.0)
+      rspec-support (~> 3.8.0)
-    rspec-support (3.7.1)
+    rspec-support (3.8.0)
-    sass (3.5.5)
+    sass (3.5.7)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -209,9 +217,8 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    secure_headers (5.0.5)
+    secure_headers (6.0.0)
-      useragent (>= 0.15.0)
+    sentry-raven (2.7.4)
-    sentry-raven (2.7.2)
       faraday (>= 0.7.6, < 1.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
@@ -224,15 +231,14 @@ GEM
     thor (0.19.4)
     thread_safe (0.3.6)
     tilt (2.0.8)
-    turbolinks (5.1.0)
+    turbolinks (5.2.0)
-      turbolinks-source (~> 5.1)
+      turbolinks-source (~> 5.2)
-    turbolinks-source (5.1.0)
+    turbolinks-source (5.2.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (4.1.6)
+    uglifier (4.1.18)
       execjs (>= 0.3.0, < 3)
-    useragent (0.16.10)
+    websocket-driver (0.7.0)
-    websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
 
@@ -273,7 +279,7 @@ DEPENDENCIES
   nilify_blanks
   nio4r
   puma (~> 3.0)
-  rails (= 5.1.6)
+  rails (= 5.2.1)
   rspec
   rspec-rails
   sass-rails (~> 5.0)

app/models/statistic.rb

@@ -3,9 +3,9 @@
 # Table name: statistics
 #
 #  id             :integer          not null, primary key
-#  total_messages :integer          default(0)
+#  total_messages :bigint(8)        default(0)
-#  total_outgoing :integer          default(0)
+#  total_outgoing :bigint(8)        default(0)
-#  total_incoming :integer          default(0)
+#  total_incoming :bigint(8)        default(0)
 #
 
 class Statistic < ApplicationRecord

config/initializers/new_framework_defaults.rb

@@ -17,8 +17,5 @@ ActiveSupport.to_time_preserves_timezone = true
 # Require `belongs_to` associations by default. Previous versions had false.
 Rails.application.config.active_record.belongs_to_required_by_default = true
 
-# Do not halt callback chains when a callback returns false. Previous versions had true.
-ActiveSupport.halt_callback_chains_on_return_false = false
-
 # Configure SSL options to enable HSTS with subdomains. Previous versions had false.
 Rails.application.config.ssl_options = false

db/schema.rb

@@ -10,9 +10,9 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180216114344) do
+ActiveRecord::Schema.define(version: 2018_02_16_114344) do
 
-  create_table "additional_route_endpoints", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t|
+  create_table "additional_route_endpoints", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
     t.integer "route_id"
     t.string "endpoint_type"
     t.integer "endpoint_id"
@@ -20,7 +20,7 @@ ActiveRecord::Schema.define(version: 20180216114344) do
     t.datetime "updated_at", null: false
   end
 
-  create_table "address_endpoints", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t|
+  create_table "address_endpoints", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
     t.integer "server_id"
     t.string "uuid"
     t.string "address"
@@ -29,7 +29,7 @@ ActiveRecord::Schema.define(version: 20180216114344) do
     t.datetime "updated_at", null: false
   end
 
-  create_table "authie_sessions", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t|
+  create_table "authie_sessions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
     t.string "token"
     t.string "browser_id"
     t.integer "user_id"
@@ -52,13 +52,13 @@ ActiveRecord::Schema.define(version: 20180216114344) do
     t.datetime "password_seen_at"
     t.string "token_hash"
     t.string "host"
-    t.index ["browser_id"], name: "index_authie_sessions_on_browser_id", length: { browser_id: 8 }
+    t.index ["browser_id"], name: "index_authie_sessions_on_browser_id", length: 8
-    t.index ["token"], name: "index_authie_sessions_on_token", length: { token: 8 }
+    t.index ["token"], name: "index_authie_sessions_on_token", length: 8
-    t.index ["token_hash"], name: "index_authie_sessions_on_token_hash", length: { token_hash: 8 }
+    t.index ["token_hash"], name: "index_authie_sessions_on_token_hash", length: 8
     t.index ["user_id"], name: "index_authie_sessions_on_user_id"
   end
 
-  create_table "credentials", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t|
+  create_table "credentials", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
     t.integer "server_id"
     t.string "key"
     t.string "type"
@@ -70,7 +70,7 @@ ActiveRecord::Schema.define(version: 20180216114344) do
     t.boolean "hold", default: false
   end
 
-  create_table "domains", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t|
+  create_table "domains", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
     t.integer "server_id"
     t.string "uuid"
     t.string "name"
@@ -96,10 +96,10 @@ ActiveRecord::Schema.define(version: 20180216114344) do
     t.string "dkim_identifier_string"
     t.boolean "use_for_any"
     t.index ["server_id"], name: "index_domains_on_server_id"
-    t.index ["uuid"], name: "index_domains_on_uuid", length: { uuid: 8 }
+    t.index ["uuid"], name: "index_domains_on_uuid", length: 8
   end
 
-  create_table "http_endpoints", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t|
+  create_table "http_endpoints", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
     t.integer "server_id"
     t.string "uuid"
     t.string "name"
@@ -116,7 +116,7 @@ ActiveRecord::Schema.define(version: 20180216114344) do
     t.integer "timeout"
   end
 
-  create_table "ip_addresses", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t|
+  create_table "ip_addresses", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
     t.integer "ip_pool_id"
     t.string "ipv4"
     t.string "ipv6"
@@ -125,7 +125,7 @@ ActiveRecord::Schema.define(version: 20180216114344) do
     t.string "hostname"
   end
 
-  create_table "ip_pool_rules", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t|
+  create_table "ip_pool_rules", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
     t.string "uuid"
     t.string "owner_type"
     t.integer "owner_id"
@@ -136,23 +136,23 @@ ActiveRecord::Schema.define(version: 20180216114344) do
     t.datetime "updated_at", null: false
   end
 
-  create_table "ip_pools", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t|
+  create_table "ip_pools", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
     t.string "name"
     t.string "uuid"
     t.datetime "created_at", precision: 6
     t.datetime "updated_at", precision: 6
     t.boolean "default", default: false
-    t.index ["uuid"], name: "index_ip_pools_on_uuid", length: { uuid: 8 }
+    t.index ["uuid"], name: "index_ip_pools_on_uuid", length: 8
   end
 
-  create_table "organization_ip_pools", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t|
+  create_table "organization_ip_pools", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
     t.integer "organization_id"
     t.integer "ip_pool_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
 
-  create_table "organization_users", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t|
+  create_table "organization_users", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
     t.integer "organization_id"
     t.integer "user_id"
     t.datetime "created_at", precision: 6
@@ -161,7 +161,7 @@ ActiveRecord::Schema.define(version: 20180216114344) do
     t.string "user_type"
   end
 
-  create_table "organizations", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t|
+  create_table "organizations", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
     t.string "uuid"
     t.string "name"
     t.string "permalink"
@@ -173,11 +173,11 @@ ActiveRecord::Schema.define(version: 20180216114344) do
     t.datetime "deleted_at", precision: 6
     t.datetime "suspended_at", precision: 6
     t.string "suspension_reason"
-    t.index ["permalink"], name: "index_organizations_on_permalink", length: { permalink: 8 }
+    t.index ["permalink"], name: "index_organizations_on_permalink", length: 8
-    t.index ["uuid"], name: "index_organizations_on_uuid", length: { uuid: 8 }
+    t.index ["uuid"], name: "index_organizations_on_uuid", length: 8
   end
 
-  create_table "queued_messages", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t|
+  create_table "queued_messages", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
     t.integer "server_id"
     t.integer "message_id"
     t.string "domain"
@@ -191,12 +191,12 @@ ActiveRecord::Schema.define(version: 20180216114344) do
     t.integer "route_id"
     t.boolean "manual", default: false
     t.string "batch_key"
-    t.index ["domain"], name: "index_queued_messages_on_domain", length: { domain: 8 }
+    t.index ["domain"], name: "index_queued_messages_on_domain", length: 8
     t.index ["message_id"], name: "index_queued_messages_on_message_id"
     t.index ["server_id"], name: "index_queued_messages_on_server_id"
   end
 
-  create_table "routes", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t|
+  create_table "routes", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
     t.string "uuid"
     t.integer "server_id"
     t.integer "domain_id"
@@ -208,10 +208,10 @@ ActiveRecord::Schema.define(version: 20180216114344) do
     t.datetime "updated_at", precision: 6
     t.string "token"
     t.string "mode"
-    t.index ["token"], name: "index_routes_on_token", length: { token: 6 }
+    t.index ["token"], name: "index_routes_on_token", length: 6
   end
 
-  create_table "servers", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t|
+  create_table "servers", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
     t.integer "organization_id"
     t.string "uuid"
     t.string "name"
@@ -240,12 +240,12 @@ ActiveRecord::Schema.define(version: 20180216114344) do
     t.string "suspension_reason"
     t.boolean "log_smtp_data", default: false
     t.index ["organization_id"], name: "index_servers_on_organization_id"
-    t.index ["permalink"], name: "index_servers_on_permalink", length: { permalink: 6 }
+    t.index ["permalink"], name: "index_servers_on_permalink", length: 6
-    t.index ["token"], name: "index_servers_on_token", length: { token: 6 }
+    t.index ["token"], name: "index_servers_on_token", length: 6
-    t.index ["uuid"], name: "index_servers_on_uuid", length: { uuid: 8 }
+    t.index ["uuid"], name: "index_servers_on_uuid", length: 8
   end
 
-  create_table "smtp_endpoints", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t|
+  create_table "smtp_endpoints", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
     t.integer "server_id"
     t.string "uuid"
     t.string "name"
@@ -259,13 +259,13 @@ ActiveRecord::Schema.define(version: 20180216114344) do
     t.datetime "updated_at", precision: 6
   end
 
-  create_table "statistics", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t|
+  create_table "statistics", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
     t.bigint "total_messages", default: 0
     t.bigint "total_outgoing", default: 0
     t.bigint "total_incoming", default: 0
   end
 
-  create_table "track_certificates", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t|
+  create_table "track_certificates", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
     t.string "domain"
     t.text "certificate"
     t.text "intermediaries"
@@ -276,10 +276,10 @@ ActiveRecord::Schema.define(version: 20180216114344) do
     t.string "verification_string"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["domain"], name: "index_track_certificates_on_domain", length: { domain: 8 }
+    t.index ["domain"], name: "index_track_certificates_on_domain", length: 8
   end
 
-  create_table "track_domains", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t|
+  create_table "track_domains", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
     t.string "uuid"
     t.integer "server_id"
     t.integer "domain_id"
@@ -295,16 +295,16 @@ ActiveRecord::Schema.define(version: 20180216114344) do
     t.text "excluded_click_domains"
   end
 
-  create_table "user_invites", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t|
+  create_table "user_invites", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
     t.string "uuid"
     t.string "email_address"
     t.datetime "expires_at", precision: 6
     t.datetime "created_at", precision: 6
     t.datetime "updated_at", precision: 6
-    t.index ["uuid"], name: "index_user_invites_on_uuid", length: { uuid: 12 }
+    t.index ["uuid"], name: "index_user_invites_on_uuid", length: 12
   end
 
-  create_table "users", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t|
+  create_table "users", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
     t.string "uuid"
     t.string "first_name"
     t.string "last_name"
@@ -318,18 +318,18 @@ ActiveRecord::Schema.define(version: 20180216114344) do
     t.string "password_reset_token"
     t.datetime "password_reset_token_valid_until"
     t.boolean "admin", default: false
-    t.index ["email_address"], name: "index_users_on_email_address", length: { email_address: 8 }
+    t.index ["email_address"], name: "index_users_on_email_address", length: 8
-    t.index ["uuid"], name: "index_users_on_uuid", length: { uuid: 8 }
+    t.index ["uuid"], name: "index_users_on_uuid", length: 8
   end
 
-  create_table "webhook_events", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t|
+  create_table "webhook_events", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
     t.integer "webhook_id"
     t.string "event"
     t.datetime "created_at", precision: 6
     t.index ["webhook_id"], name: "index_webhook_events_on_webhook_id"
   end
 
-  create_table "webhook_requests", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t|
+  create_table "webhook_requests", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
     t.integer "server_id"
     t.integer "webhook_id"
     t.string "url"
@@ -342,7 +342,7 @@ ActiveRecord::Schema.define(version: 20180216114344) do
     t.datetime "created_at", precision: 6
   end
 
-  create_table "webhooks", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t|
+  create_table "webhooks", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
     t.integer "server_id"
     t.string "uuid"
     t.string "name"