Merge pull request #1084 from kmycode/kb-draft-22.1

Release: 22.1

Author: kmycode

app/controllers/application_controller.rb

@@ -174,7 +174,11 @@ def current_session
   end
 
   def current_theme
-    return Setting.theme unless Themes.instance.names.include? current_user&.setting_theme
+    unless Themes.instance.names.include? current_user&.setting_theme
+      return 'default' unless Themes.instance.names.include? Setting.theme
+
+      return Setting.theme
+    end
 
     current_user.setting_theme
   end

docker-compose.yml

@@ -59,7 +59,7 @@ services:
   web:
     # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes
     build: .
-    image: kmyblue:22.0
+    image: kmyblue:22.1
     restart: always
     env_file: .env.production
     command: bundle exec puma -C config/puma.rb
@@ -83,7 +83,7 @@ services:
     build:
       dockerfile: ./streaming/Dockerfile
       context: .
-    image: kmyblue-streaming:22.0
+    image: kmyblue-streaming:22.1
     restart: always
     env_file: .env.production
     command: node ./streaming/index.js
@@ -101,7 +101,7 @@ services:
 
   sidekiq:
     build: .
-    image: kmyblue:22.0
+    image: kmyblue:22.1
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq

lib/mastodon/version.rb

@@ -13,7 +13,7 @@ def kmyblue_major
     end
 
     def kmyblue_minor
-      0
+      1
     end
 
     def kmyblue_flag