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…

config/initializers/timeout.rb

@@ -1,6 +0,0 @@
-Rack::Timeout::Logger.disable
-Rack::Timeout.service_timeout = false
-
-if Rails.env.production?
-  Rack::Timeout.service_timeout = 90
-end

config/initializers/twitter_regex.rb

@@ -30,7 +30,7 @@ module Twitter
       (                                                                                     #   $1 total match
         (#{REGEXEN[:valid_url_preceding_chars]})                                            #   $2 Preceeding chracter
         (                                                                                   #   $3 URL
-          (https?:\/\/)?                                                                    #   $4 Protocol (optional)
+          ((https?|dat|dweb|ipfs|ipns|ssb|gopher):\/\/)?                                    #   $4 Protocol (optional)
           (#{REGEXEN[:valid_domain]})                                                       #   $5 Domain(s)
           (?::(#{REGEXEN[:valid_port_number]}))?                                            #   $6 Port number (optional)
           (/#{REGEXEN[:valid_url_path]}*)?                                                  #   $7 URL Path and anchor

config/locales/en.yml

@@ -515,6 +515,7 @@ en:
       '86400': 1 day
     expires_in_prompt: Never
     generate: Generate
+    invited_by: 'You were invited by:'
     max_uses:
       one: 1 use
       other: "%{count} uses"

config/locales/simple_form.en.yml

@@ -3,6 +3,7 @@ en:
   simple_form:
     hints:
       defaults:
+        autofollow: People who sign up through the invite will automatically follow you
         avatar: PNG, GIF or JPG. At most 2MB. Will be downscaled to 400x400px
         bot: This account mainly performs automated actions and might not be monitored
         digest: Only sent after a long period of inactivity and only if you have received any personal messages in your absence
@@ -30,6 +31,7 @@ en:
           name: Label
           value: Content
       defaults:
+        autofollow: Invite to follow your account
         avatar: Avatar
         bot: This is a bot account
         confirm_new_password: Confirm new password