Merge remote-tracking branch 'parent/main' into kbtopic-remove-quote

lib/mastodon/migration_warning.rb

@@ -23,7 +23,7 @@ module Mastodon
 
     def announce_countdown
       WARNING_SECONDS.downto(1) do |i|
-        say "Continuing in #{i} second#{i == 1 ? '' : 's'}...", true
+        say "Continuing in #{i} second#{'s' unless i == 1}...", true
         sleep 1
       end
     end

lib/mastodon/prometheus_exporter/local_server.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'prometheus_exporter/server'
+require 'prometheus_exporter/client'
+
+module Mastodon::PrometheusExporter
+  module LocalServer
+    mattr_accessor :bind, :port
+
+    def self.setup!
+      server = PrometheusExporter::Server::WebServer.new(bind:, port:)
+      server.start
+
+      # wire up a default local client
+      PrometheusExporter::Client.default = PrometheusExporter::LocalClient.new(collector: server.collector)
+    end
+  end
+end

lib/mastodon/version.rb

@@ -35,7 +35,7 @@ module Mastodon
     end
 
     def default_prerelease
-      'alpha.5'
+      'beta.1'
     end
 
     def prerelease
@@ -127,7 +127,7 @@ module Mastodon
     end
 
     def user_agent
-      @user_agent ||= "Mastodon/#{Version} (#{HTTP::Request::USER_AGENT}; +http#{Rails.configuration.x.use_https ? 's' : ''}://#{Rails.configuration.x.web_domain}/)"
+      @user_agent ||= "Mastodon/#{Version} (#{HTTP::Request::USER_AGENT}; +http#{'s' if Rails.configuration.x.use_https}://#{Rails.configuration.x.web_domain}/)"
     end
 
     def version_configuration

lib/paperclip/color_extractor.rb

@@ -239,7 +239,7 @@ module Paperclip
     end
 
     def rgb_to_hex(rgb)
-      format('#%02x%02x%02x', rgb.r, rgb.g, rgb.b)
+      format('#%02x%02x%02x', rgb.r, rgb.g, rgb.b) # rubocop:disable Style/FormatStringToken
     end
   end
 end

lib/tasks/repo.rake

@@ -57,7 +57,7 @@ namespace :repo do
                 response = nil
 
                 loop do
-                  response = HTTP.headers('Authorization' => "token #{ENV['GITHUB_API_TOKEN']}").get("https://api.github.com/repos/#{REPOSITORY_NAME}/pulls/#{pull_request_number}")
+                  response = HTTP.headers('Authorization' => "token #{ENV.fetch('GITHUB_API_TOKEN')}").get("https://api.github.com/repos/#{REPOSITORY_NAME}/pulls/#{pull_request_number}")
 
                   if response.code == 403
                     sleep_for = (response.headers['X-RateLimit-Reset'].to_i - Time.now.to_i).abs