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

Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system

lib/cli.rb

@@ -96,6 +96,8 @@ module Mastodon
 
       prompt.warn('Do NOT interrupt this process...')
 
+      Setting.registrations_mode = 'none'
+
       Account.local.without_suspended.find_each do |account|
         payload = ActiveModelSerializers::SerializableResource.new(
           account,

lib/mastodon/version.rb

@@ -9,15 +9,15 @@ module Mastodon
     end
 
     def minor
-      0
-    end
-
-    def patch
       1
     end
 
+    def patch
+      0
+    end
+
     def flags
-      ''
+      'rc1'
     end
 
     def suffix

lib/tasks/auto_annotate_models.rake

@@ -4,6 +4,7 @@ if Rails.env.development?
   task :set_annotation_options do
     Annotate.set_defaults(
       'routes'                  => 'false',
+      'models'                  => 'true',
       'position_in_routes'      => 'before',
       'position_in_class'       => 'before',
       'position_in_test'        => 'before',