]> git.openstreetmap.org Git - rails.git/blobdiff - app/controllers/application_controller.rb
Fix new rubocop warnings
[rails.git] / app / controllers / application_controller.rb
index 25c430f1c0290d02b01a89a412d6eb1fc68aae05..f6006fe5e4ccdc7139a6db14d5e0cf7adf5ee748 100644 (file)
@@ -114,7 +114,7 @@ class ApplicationController < ActionController::Base
 
   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
@@ -339,7 +339,7 @@ class ApplicationController < ActionController::Base
     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