Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-05-05 15:56:22 +0300
committerRémy Coutable <remy@rymai.me>2017-05-05 15:56:22 +0300
commit729c006ff82fcb87afe8eb3e6a21254892f43afd (patch)
treecfe3157742eed46e1448f675179f136e738fa124
parent8a5c95d2509cd976d2063087d3fbaad57f1cb630 (diff)
parent7af4c0c4f7dc66f7293a121d1c0e2caa8a5050c6 (diff)
Merge branch 'fix-email-receiver-metrics' into 'master'
Fix email receiver metrics events See merge request !11112
-rw-r--r--lib/gitlab/email/handler/create_issue_handler.rb2
-rw-r--r--lib/gitlab/email/handler/create_note_handler.rb2
-rw-r--r--lib/gitlab/email/handler/unsubscribe_handler.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/email/handler/create_issue_handler.rb b/lib/gitlab/email/handler/create_issue_handler.rb
index e7f91607e7e..a616a80e8f5 100644
--- a/lib/gitlab/email/handler/create_issue_handler.rb
+++ b/lib/gitlab/email/handler/create_issue_handler.rb
@@ -37,7 +37,7 @@ module Gitlab
end
def metrics_params
- super.merge(project: project)
+ super.merge(project: project&.full_path)
end
private
diff --git a/lib/gitlab/email/handler/create_note_handler.rb b/lib/gitlab/email/handler/create_note_handler.rb
index 31bb775c357..31579e94a87 100644
--- a/lib/gitlab/email/handler/create_note_handler.rb
+++ b/lib/gitlab/email/handler/create_note_handler.rb
@@ -29,7 +29,7 @@ module Gitlab
end
def metrics_params
- super.merge(project: project)
+ super.merge(project: project&.full_path)
end
private
diff --git a/lib/gitlab/email/handler/unsubscribe_handler.rb b/lib/gitlab/email/handler/unsubscribe_handler.rb
index df70a063330..5894384da5d 100644
--- a/lib/gitlab/email/handler/unsubscribe_handler.rb
+++ b/lib/gitlab/email/handler/unsubscribe_handler.rb
@@ -20,7 +20,7 @@ module Gitlab
end
def metrics_params
- super.merge(project: project)
+ super.merge(project: project&.full_path)
end
private