Commit a1c08c12 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'rails5-env-deprecated' into 'master'

Rails5: env is deprecated and will be removed from Rails 5.1

Closes #54384

See merge request gitlab-org/gitlab-ce!22626
parents a033faa2 616fbd02
......@@ -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}"
......
......@@ -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,
......
---
title: 'Rails5: env is deprecated and will be removed from Rails 5.1'
merge_request: 22626
author: Jasper Maes
type: other
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment