diff options
| author | Felipe Artur Cardozo <fcardozo@gitlab.com> | 2018-07-24 20:25:25 +0000 |
|---|---|---|
| committer | Felipe Artur Cardozo <fcardozo@gitlab.com> | 2018-07-24 20:25:25 +0000 |
| commit | 236ed1f2f36df1a1a2245dbd2543d17071935313 (patch) | |
| tree | 7ac8b4715c7c1c677f23f65a4ea25bb1b7855168 /app/workers | |
| parent | f5b45519dba89296cbd6f350f5c29b655d5aef8d (diff) | |
| parent | 9e29408ee6072f2559899582b3300a6de54069ff (diff) | |
| download | gitlab-ce-236ed1f2f36df1a1a2245dbd2543d17071935313.tar.gz | |
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 'app/workers')
| -rw-r--r-- | app/workers/concerns/gitlab/github_import/object_importer.rb | 2 | ||||
| -rw-r--r-- | app/workers/repository_fork_worker.rb | 4 | ||||
| -rw-r--r-- | app/workers/repository_import_worker.rb | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/app/workers/concerns/gitlab/github_import/object_importer.rb b/app/workers/concerns/gitlab/github_import/object_importer.rb index 100d86e38c8..eeeff6e93a0 100644 --- a/app/workers/concerns/gitlab/github_import/object_importer.rb +++ b/app/workers/concerns/gitlab/github_import/object_importer.rb @@ -22,7 +22,7 @@ module Gitlab importer_class.new(object, project, client).execute - counter.increment(project: project.full_path) + counter.increment end def counter diff --git a/app/workers/repository_fork_worker.rb b/app/workers/repository_fork_worker.rb index 5ef9b744db3..68ec66e8499 100644 --- a/app/workers/repository_fork_worker.rb +++ b/app/workers/repository_fork_worker.rb @@ -23,9 +23,7 @@ class RepositoryForkWorker def fork_repository(target_project, source_repository_storage_name, source_disk_path) return unless start_fork(target_project) - Gitlab::Metrics.add_event(:fork_repository, - source_path: source_disk_path, - target_path: target_project.disk_path) + Gitlab::Metrics.add_event(:fork_repository) result = gitlab_shell.fork_repository(source_repository_storage_name, source_disk_path, target_project.repository_storage, target_project.disk_path) diff --git a/app/workers/repository_import_worker.rb b/app/workers/repository_import_worker.rb index 25fec542ac7..8c64c513c74 100644 --- a/app/workers/repository_import_worker.rb +++ b/app/workers/repository_import_worker.rb @@ -11,9 +11,7 @@ class RepositoryImportWorker return unless start_import(project) - Gitlab::Metrics.add_event(:import_repository, - import_url: project.import_url, - path: project.full_path) + Gitlab::Metrics.add_event(:import_repository) service = Projects::ImportService.new(project, project.creator) result = service.execute |