Merge branch 'ce-to-ee-2018-11-23' into 'master'

CE upstream - 2018-11-23 07:26 UTC

See merge request gitlab-org/gitlab-ee!8563

app/controllers/application_controller.rb

@@ -167,7 +167,7 @@ class ApplicationController < ActionController::Base
   def log_exception(exception)
     Raven.capture_exception(exception) if sentry_enabled?
 
-    backtrace_cleaner = Gitlab.rails5? ? env["action_dispatch.backtrace_cleaner"] : env
+    backtrace_cleaner = Gitlab.rails5? ? request.env["action_dispatch.backtrace_cleaner"] : env
     application_trace = ActionDispatch::ExceptionWrapper.new(backtrace_cleaner, exception).application_trace
     application_trace.map! { |t| "  #{t}\n" }
     logger.error "\n#{exception.class.name} (#{exception.message}):\n#{application_trace.join}"

app/controllers/sessions_controller.rb

@@ -103,7 +103,7 @@ class SessionsController < Devise::SessionsController
   end
 
   def failed_login?
-    (options = env["warden.options"]) && options[:action] == "unauthenticated"
+    (options = request.env["warden.options"]) && options[:action] == "unauthenticated"
   end
 
   # Handle an "initial setup" state, where there's only one user, it's an admin,

changelogs/unreleased/rails5-env-deprecated.yml

+---
+title: 'Rails5: env is deprecated and will be removed from Rails 5.1'
+merge_request: 22626
+author: Jasper Maes
+type: other