Merge remote-tracking branch 'parent/stable-4.3' into kb-draft-15.4-lts

lib/mastodon/cli/ip_blocks.rb

@@ -5,7 +5,7 @@ require_relative 'base'
 
 module Mastodon::CLI
   class IpBlocks < Base
-    option :severity, required: true, enum: %w(no_access sign_up_requires_approval sign_up_block), desc: 'Severity of the block'
+    option :severity, required: true, enum: IpBlock.severities.keys, desc: 'Severity of the block'
     option :comment, aliases: [:c], desc: 'Optional comment'
     option :duration, aliases: [:d], type: :numeric, desc: 'Duration of the block in seconds'
     option :force, type: :boolean, aliases: [:f], desc: 'Overwrite existing blocks'

lib/mastodon/version.rb

@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def kmyblue_minor
-      3
+      4
     end
 
     def kmyblue_flag
@@ -31,7 +31,7 @@ module Mastodon
     end
 
     def patch
-      0
+      1
     end
 
     def default_prerelease