diff options
| author | Felipe Artur Cardozo <fcardozo@gitlab.com> | 2018-07-24 23:25:25 +0300 |
|---|---|---|
| committer | Felipe Artur Cardozo <fcardozo@gitlab.com> | 2018-07-24 23:25:25 +0300 |
| commit | 236ed1f2f36df1a1a2245dbd2543d17071935313 (patch) | |
| tree | 7ac8b4715c7c1c677f23f65a4ea25bb1b7855168 /lib/gitlab/email | |
| parent | f5b45519dba89296cbd6f350f5c29b655d5aef8d (diff) | |
| parent | 9e29408ee6072f2559899582b3300a6de54069ff (diff) | |
Merge branch 'security-event-counters-private-data' into 'master'
[master] Don't expose project names in various counters
See merge request gitlab/gitlabhq!2418
Diffstat (limited to 'lib/gitlab/email')
4 files changed, 0 insertions, 16 deletions
diff --git a/lib/gitlab/email/handler/create_issue_handler.rb b/lib/gitlab/email/handler/create_issue_handler.rb index 764f93f6d3d..fc8615afcae 100644 --- a/lib/gitlab/email/handler/create_issue_handler.rb +++ b/lib/gitlab/email/handler/create_issue_handler.rb @@ -36,10 +36,6 @@ module Gitlab @project ||= Project.find_by_full_path(project_path) end - def metrics_params - super.merge(project: project&.full_path) - end - private def create_issue diff --git a/lib/gitlab/email/handler/create_merge_request_handler.rb b/lib/gitlab/email/handler/create_merge_request_handler.rb index 2f864f2082b..2316e58c3fc 100644 --- a/lib/gitlab/email/handler/create_merge_request_handler.rb +++ b/lib/gitlab/email/handler/create_merge_request_handler.rb @@ -40,10 +40,6 @@ module Gitlab @project ||= Project.find_by_full_path(project_path) end - def metrics_params - super.merge(project: project&.full_path) - end - private def create_merge_request diff --git a/lib/gitlab/email/handler/create_note_handler.rb b/lib/gitlab/email/handler/create_note_handler.rb index 5791dbd0484..379b114e957 100644 --- a/lib/gitlab/email/handler/create_note_handler.rb +++ b/lib/gitlab/email/handler/create_note_handler.rb @@ -28,10 +28,6 @@ module Gitlab record_name: 'comment') end - def metrics_params - super.merge(project: project&.full_path) - end - private def author diff --git a/lib/gitlab/email/handler/unsubscribe_handler.rb b/lib/gitlab/email/handler/unsubscribe_handler.rb index ea80e21532e..56751e4e41e 100644 --- a/lib/gitlab/email/handler/unsubscribe_handler.rb +++ b/lib/gitlab/email/handler/unsubscribe_handler.rb @@ -20,10 +20,6 @@ module Gitlab noteable.unsubscribe(sent_notification.recipient) end - def metrics_params - super.merge(project: project&.full_path) - end - private def sent_notification |