diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-06-19 07:27:01 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-06-19 07:27:01 +0000 |
| commit | 0f18d4896c63ad91074f1963737f5ba4458031f0 (patch) | |
| tree | 5d19f883f1a6debf4d2422856b7ff39f092452c0 | |
| parent | 0716e19271ec8234b06164bf701a33c16bd221de (diff) | |
| parent | 20adfb53693879a4b5c29b752fc06a130df18d42 (diff) | |
| download | gitlab-ce-0f18d4896c63ad91074f1963737f5ba4458031f0.tar.gz | |
Merge branch 'rails5-nil-formats' into 'master'
Fix nil formats test
Closes #47833
See merge request gitlab-org/gitlab-ce!19941
| -rw-r--r-- | spec/lib/gitlab/auth/user_auth_finders_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/auth/user_auth_finders_spec.rb b/spec/lib/gitlab/auth/user_auth_finders_spec.rb index 136646bd4ee..454ad1589b9 100644 --- a/spec/lib/gitlab/auth/user_auth_finders_spec.rb +++ b/spec/lib/gitlab/auth/user_auth_finders_spec.rb @@ -99,7 +99,7 @@ describe Gitlab::Auth::UserAuthFinders do context 'when the request format is empty' 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 |