Merge remote-tracking branch 'upstream/pull/5542'

[rails.git] / app / controllers / application_controller.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 25c430f1c0290d02b01a89a412d6eb1fc68aae05..9949149aa66a7823ad768a288c8a48972d228f63 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -114,7 +114,7 @@ class ApplicationController < ActionController::Base
 
   def check_database_writable(need_api: false)
     if Settings.status == "database_offline" || Settings.status == "database_readonly" ||
 
   def check_database_writable(need_api: false)
     if Settings.status == "database_offline" || Settings.status == "database_readonly" ||

-       (need_api && (Settings.status == "api_offline" || Settings.status == "api_readonly"))
+       (need_api && %w[api_offline api_readonly].include?(Settings.status))

       if request.xhr?
         report_error "Database offline for maintenance", :service_unavailable
       else
       if request.xhr?
         report_error "Database offline for maintenance", :service_unavailable
       else


@@ -304,10 +304,7 @@ class ApplicationController < ActionController::Base
   end
 
   def deny_access(_exception)
   end
 
   def deny_access(_exception)

-    if doorkeeper_token
-      set_locale
-      report_error t("oauth.permissions.missing"), :forbidden
-    elsif current_user
+    if current_user

       set_locale
       respond_to do |format|
         format.html { redirect_to :controller => "/errors", :action => "forbidden" }
       set_locale
       respond_to do |format|
         format.html { redirect_to :controller => "/errors", :action => "forbidden" }


@@ -339,7 +336,7 @@ class ApplicationController < ActionController::Base
     begin
       referer = URI.parse(referer)
 
     begin
       referer = URI.parse(referer)
 

-      if referer.scheme == "http" || referer.scheme == "https"
+      if %w[http https].include?(referer.scheme)

         referer.scheme = nil
         referer.host = nil
         referer.port = nil
         referer.scheme = nil
         referer.host = nil
         referer.port = nil