diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-12-17 14:02:17 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-12-17 14:02:17 +0300 |
| commit | 32b6129d8cef406b1cafa455fcf0bf83ddba46de (patch) | |
| tree | c3b11f9f7aec8ced342a5d5868bb203dfe12569b /spec/support | |
| parent | 9072516f8a5b4298175dbea4d62fcf6203297337 (diff) | |
| parent | 56296f1edadf2bc5f7741cbb3f97cb41f090aac6 (diff) | |
Merge branch 'remove-rails4-specific-code' into 'master'
Remove rails4 specific code
See merge request gitlab-org/gitlab-ce!23847
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/helpers/test_request_helpers.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/spec/support/helpers/test_request_helpers.rb b/spec/support/helpers/test_request_helpers.rb index 187a0e07891..5a84d67bdfc 100644 --- a/spec/support/helpers/test_request_helpers.rb +++ b/spec/support/helpers/test_request_helpers.rb @@ -2,10 +2,6 @@ module TestRequestHelpers def test_request(remote_ip: '127.0.0.1') - if Gitlab.rails5? - ActionController::TestRequest.new({ remote_ip: remote_ip }, ActionController::TestSession.new) - else - ActionController::TestRequest.new(remote_ip: remote_ip) - end + ActionController::TestRequest.new({ remote_ip: remote_ip }, ActionController::TestSession.new) end end |