Commit 914bfabb authored by Stan Hu's avatar Stan Hu

Merge branch 'ce-port-4550-add-project-download-export-audit-event' into 'master'

CE: Add project download & project export audit event

See merge request gitlab-org/gitlab-ce!31103
parents f7641d84 6cfd1372
...@@ -73,6 +73,8 @@ From there, you can see the following actions: ...@@ -73,6 +73,8 @@ From there, you can see the following actions:
- User was added to project and with which [permissions] - User was added to project and with which [permissions]
- Permission changes of a user assigned to a project - Permission changes of a user assigned to a project
- User was removed from project - User was removed from project
- Project export was downloaded
- Project repository was downloaded
### Instance events **(PREMIUM ONLY)** ### Instance events **(PREMIUM ONLY)**
......
...@@ -544,5 +544,9 @@ module API ...@@ -544,5 +544,9 @@ module API
params[:archived] params[:archived]
end end
def ip_address
env["action_dispatch.remote_ip"].to_s || request.ip
end
end end
end end
...@@ -25,7 +25,7 @@ module API ...@@ -25,7 +25,7 @@ module API
end end
def get_runner_ip def get_runner_ip
{ ip_address: env["action_dispatch.remote_ip"].to_s || request.ip } { ip_address: ip_address }
end end
def current_runner def current_runner
......
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