Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
	app/javascript/mastodon/initial_state.js
	db/schema.rb

Upstream added a new field to initial_state.
Not too sure about what happened with db/schema.rb though…

2 files changed, 19 insertions, 2 deletions

diff --git a/db/migrate/20180615122121_add_autofollow_to_invites.rb b/db/migrate/20180615122121_add_autofollow_to_invites.rb
new file mode 100644
index 000000000..850b1d693
--- /dev/null
+++ b/db/migrate/20180615122121_add_autofollow_to_invites.rb
@@ -0,0 +1,17 @@
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class AddAutofollowToInvites < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def change
+    safety_assured do
+      add_column_with_default :invites, :autofollow, :bool, default: false, allow_null: false
+    end
+  end
+
+  def down
+    remove_column :invites, :autofollow
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index b1e586944..76d42312e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,9 +10,8 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
+ActiveRecord::Schema.define(version: 2018_06_15_122121) do
 
-ActiveRecord::Schema.define(version: 2018_06_09_104432) do
-  
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -240,6 +239,7 @@ ActiveRecord::Schema.define(version: 2018_06_09_104432) do
     t.integer "uses", default: 0, null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.boolean "autofollow", default: false, null: false
     t.index ["code"], name: "index_invites_on_code", unique: true
     t.index ["user_id"], name: "index_invites_on_user_id"
   end