diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-01-24 14:04:55 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-01-24 14:04:55 +0000 |
| commit | fac725c9e54bead036ca1ad5e2da0b3441aecbdf (patch) | |
| tree | 8e7fddbac1da725db9f4e0c992489e69d1e9a651 /lib | |
| parent | a59563a1043dae27790779bd47a01ca509c6b875 (diff) | |
| parent | cb67423d48f6e5e78c7ecd9196b93edf7666ba0c (diff) | |
| download | gitlab-ce-fac725c9e54bead036ca1ad5e2da0b3441aecbdf.tar.gz | |
Merge branch '53676-ip-address-of-gitlab-runner-is-wrong-in-the-runners-description' into 'master'
Get remote address for runner
Closes #53676
See merge request gitlab-org/gitlab-ce!24624
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/helpers/runner.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/helpers/runner.rb b/lib/api/helpers/runner.rb index 45d0343bc89..16df8e830e1 100644 --- a/lib/api/helpers/runner.rb +++ b/lib/api/helpers/runner.rb @@ -26,7 +26,7 @@ module API end def get_runner_ip - { ip_address: request.ip } + { ip_address: request.env["HTTP_X_FORWARDED_FOR"] || request.ip } end def current_runner |