summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormanojmj <mmj@gitlab.com>2019-07-24 19:45:50 +0530
committermanojmj <mmj@gitlab.com>2019-07-26 12:25:56 +0530
commit6cfd13726fbce725633d95140dd0e4bf1779c5db (patch)
tree25936f473a56b8993bf54fd45f279e0c2975ea26
parent2a07275121b9c965bca01767c5ccdb58c6f6e660 (diff)
downloadgitlab-ce-ce-port-4550-add-project-download-export-audit-event.tar.gz
CE: Add project download & project export audit eventce-port-4550-add-project-download-export-audit-event
This change adds audit events for download of repository and export of project.
-rw-r--r--doc/administration/audit_events.md2
-rw-r--r--lib/api/helpers.rb4
-rw-r--r--lib/api/helpers/runner.rb2
3 files changed, 7 insertions, 1 deletions
diff --git a/doc/administration/audit_events.md b/doc/administration/audit_events.md
index aaa43f67760..02de2caf558 100644
--- a/doc/administration/audit_events.md
+++ b/doc/administration/audit_events.md
@@ -73,6 +73,8 @@ From there, you can see the following actions:
- User was added to project and with which [permissions]
- Permission changes of a user assigned to a project
- User was removed from project
+- Project export was downloaded
+- Project repository was downloaded
### Instance events **(PREMIUM ONLY)**
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 8ae42c6dadd..1aa6dc44bf7 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -544,5 +544,9 @@ module API
params[:archived]
end
+
+ def ip_address
+ env["action_dispatch.remote_ip"].to_s || request.ip
+ end
end
end
diff --git a/lib/api/helpers/runner.rb b/lib/api/helpers/runner.rb
index 100463fcb95..5b87eccf860 100644
--- a/lib/api/helpers/runner.rb
+++ b/lib/api/helpers/runner.rb
@@ -25,7 +25,7 @@ module API
end
def get_runner_ip
- { ip_address: env["action_dispatch.remote_ip"].to_s || request.ip }
+ { ip_address: ip_address }
end
def current_runner