diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-04-28 13:09:44 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-04-28 13:09:44 +0000 |
| commit | 5addff7e6c89f2cad6f1af814e02ceecd2aed55b (patch) | |
| tree | f861e07e9a634d7f761ee7189d0f4a9d78e345ad /spec/lib/gitlab | |
| parent | d4668825e4cb9c6c34b6f6530a4cb64d045b96d4 (diff) | |
| parent | e99cf05875af4627e532fee77bd22574dde240d7 (diff) | |
| download | gitlab-ce-5addff7e6c89f2cad6f1af814e02ceecd2aed55b.tar.gz | |
Merge branch 'use-remote-ip-for-akismet' into 'master'
Use ActionDispatch Remote IP for Akismet checking
Previously all remote IPs appeared at 127.0.0.1, which made Akismet
not very useful. Using the ActionDispatch Remote IP (http://api.rubyonrails.org/classes/ActionDispatch/RemoteIp.html)
should provide more reliable results.
Closes #16629
See merge request !3961
Diffstat (limited to 'spec/lib/gitlab')
| -rw-r--r-- | spec/lib/gitlab/akismet_helper_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/akismet_helper_spec.rb b/spec/lib/gitlab/akismet_helper_spec.rb index 9858935180a..53f5d6c5c80 100644 --- a/spec/lib/gitlab/akismet_helper_spec.rb +++ b/spec/lib/gitlab/akismet_helper_spec.rb @@ -24,7 +24,7 @@ describe Gitlab::AkismetHelper, type: :helper do describe '#is_spam?' do it 'returns true for spam' do environment = { - 'REMOTE_ADDR' => '127.0.0.1', + 'action_dispatch.remote_ip' => '127.0.0.1', 'HTTP_USER_AGENT' => 'Test User Agent' } |