Merge remote-tracking branch 'glitchsoc/main' into main

4 files changed, 7 insertions, 4 deletions

diff --git a/config/initializers/fast_blank.rb b/config/initializers/fast_blank.rb
index 174ea7664..f0b7cac78 100644
--- a/config/initializers/fast_blank.rb
+++ b/config/initializers/fast_blank.rb
@@ -1,5 +1,5 @@
 if String.method_defined?(:blank_as?)
   class String
-    alias_method :blank?, :blank_as?
+    alias blank? blank_as?
   end
 end
diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb
index dcf6296fa..8ec642653 100644
--- a/config/initializers/simple_form.rb
+++ b/config/initializers/simple_form.rb
@@ -1,7 +1,7 @@
 # Use this setup block to configure all options available in SimpleForm.
 
 module AppendComponent
-  def append(wrapper_options = nil)
+  def append(_wrapper_options = nil)
     @append ||= begin
       options[:append].to_s.html_safe if options[:append].present?
     end
diff --git a/config/initializers/twitter_regex.rb b/config/initializers/twitter_regex.rb
index 7f99a0005..aca85dd43 100644
--- a/config/initializers/twitter_regex.rb
+++ b/config/initializers/twitter_regex.rb
@@ -75,7 +75,7 @@ module Twitter
     # XMPP or magnet URIs an empty array will be returned.
     #
     # If a block is given then it will be called for each XMPP URI.
-    def extract_extra_uris_with_indices(text, options = {}) # :yields: uri, start, end
+    def extract_extra_uris_with_indices(text, _options = {}) # :yields: uri, start, end
       return [] unless text && text.index(":")
       urls = []
 
diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml
index 2be2ef036..ec322f071 100644
--- a/config/locales/doorkeeper.en.yml
+++ b/config/locales/doorkeeper.en.yml
@@ -83,7 +83,10 @@ en:
         invalid_client: Client authentication failed due to unknown client, no client authentication included, or unsupported authentication method.
         invalid_grant: The provided authorization grant is invalid, expired, revoked, does not match the redirection URI used in the authorization request, or was issued to another client.
         invalid_redirect_uri: The redirect uri included is not valid.
-        invalid_request: The request is missing a required parameter, includes an unsupported parameter value, or is otherwise malformed.
+        invalid_request:
+          missing_param: 'Missing required parameter: %{value}.'
+          request_not_authorized: Request need to be authorized. Required parameter for authorizing request is missing or invalid.
+          unknown: The request is missing a required parameter, includes an unsupported parameter value, or is otherwise malformed.
         invalid_resource_owner: The provided resource owner credentials are not valid, or resource owner cannot be found
         invalid_scope: The requested scope is invalid, unknown, or malformed.
         invalid_token: