Commit 0f18d489 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'rails5-nil-formats' into 'master'

Fix nil formats test

Closes #47833

See merge request gitlab-org/gitlab-ce!19941
parents 0716e192 20adfb53
...@@ -99,7 +99,7 @@ describe Gitlab::Auth::UserAuthFinders do ...@@ -99,7 +99,7 @@ describe Gitlab::Auth::UserAuthFinders do
context 'when the request format is empty' do context 'when the request format is empty' do
it 'the method call does not modify the original value' do it 'the method call does not modify the original value' do
env['action_dispatch.request.formats'] = nil env.delete('action_dispatch.request.formats')
find_user_from_feed_token find_user_from_feed_token
......
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