merge catcatnya/main into main

app/controllers/auth/sessions_controller.rb

@@ -15,6 +15,10 @@ class Auth::SessionsController < Devise::SessionsController
   before_action :set_instance_presenter, only: [:new]
   before_action :set_body_classes
 
+  content_security_policy only: :new do |p|
+    p.form_action(false)
+  end
+
   def check_suspicious!
     user = find_user
     @login_is_suspicious = suspicious_sign_in?(user) unless user.nil?

lib/mastodon/version.rb

@@ -25,7 +25,7 @@ module Mastodon
     end
 
     def suffix_version
-      '+1.0.1'
+      '+1.0.2'
     end
 
     def post_suffix