summaryrefslogtreecommitdiff
path: root/app/models/issue.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-03-15 15:29:16 +0000
committerDouwe Maan <douwe@gitlab.com>2017-03-15 15:29:16 +0000
commitb7123a8f59fc6c5124c7e39f998cec9a6db5c690 (patch)
treededbf85eb7aa4ac734bcb3b2374978b7af069c70 /app/models/issue.rb
parent18778503eaec61b840b6fc0dbf54022e322f4960 (diff)
parentdd53a9c0132d48393ca11e29825b599a5a1454a7 (diff)
downloadgitlab-ce-b7123a8f59fc6c5124c7e39f998cec9a6db5c690.tar.gz
Merge branch '27271-missing-time-spent-in-issue-webhook' into 'master'
Include time tracking attributes in webhooks payload Closes #27271 See merge request !9942
Diffstat (limited to 'app/models/issue.rb')
-rw-r--r--app/models/issue.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb
index dba9398a43c..1427fdc31a4 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -58,7 +58,13 @@ class Issue < ActiveRecord::Base
end
def hook_attrs
- attributes
+ attrs = {
+ total_time_spent: total_time_spent,
+ human_total_time_spent: human_total_time_spent,
+ human_time_estimate: human_time_estimate
+ }
+
+ attributes.merge!(attrs)
end
def self.reference_prefix