From 616fbd028c05667f7094e38c81c5db3db379cc1e Mon Sep 17 00:00:00 2001 From: Jasper Maes Date: Fri, 26 Oct 2018 18:51:22 +0200 Subject: Rails5: env is deprecated and will be removed from Rails 5.1 --- app/controllers/application_controller.rb | 2 +- app/controllers/sessions_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'app/controllers') diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 7f4aa8244ac..5f30154df38 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -163,7 +163,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}" diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 643eb75c83c..4bd7d71e264 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -104,7 +104,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, -- cgit v1.2.3