Rails5: env is deprecated and will be removed from Rails 5.1
This commit is contained in:
parent
64c35c74f9
commit
616fbd028c
|
@ -163,7 +163,7 @@ class ApplicationController < ActionController::Base
|
||||||
def log_exception(exception)
|
def log_exception(exception)
|
||||||
Raven.capture_exception(exception) if sentry_enabled?
|
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 = ActionDispatch::ExceptionWrapper.new(backtrace_cleaner, exception).application_trace
|
||||||
application_trace.map! { |t| " #{t}\n" }
|
application_trace.map! { |t| " #{t}\n" }
|
||||||
logger.error "\n#{exception.class.name} (#{exception.message}):\n#{application_trace.join}"
|
logger.error "\n#{exception.class.name} (#{exception.message}):\n#{application_trace.join}"
|
||||||
|
|
|
@ -104,7 +104,7 @@ class SessionsController < Devise::SessionsController
|
||||||
end
|
end
|
||||||
|
|
||||||
def failed_login?
|
def failed_login?
|
||||||
(options = env["warden.options"]) && options[:action] == "unauthenticated"
|
(options = request.env["warden.options"]) && options[:action] == "unauthenticated"
|
||||||
end
|
end
|
||||||
|
|
||||||
# Handle an "initial setup" state, where there's only one user, it's an admin,
|
# Handle an "initial setup" state, where there's only one user, it's an admin,
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: 'Rails5: env is deprecated and will be removed from Rails 5.1'
|
||||||
|
merge_request: 22626
|
||||||
|
author: Jasper Maes
|
||||||
|
type: other
|
Loading…
Reference in New Issue