diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-11-15 20:23:29 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-11-15 20:23:29 +0300 |
| commit | f995f8404ddd1f692f9e07be4f5266a062eaa702 (patch) | |
| tree | 19cd6706d4e49e7088a4951f5b47205de4facdb7 /lib | |
| parent | 43cb480aaa876db8023aaa17625c384c4e870045 (diff) | |
| parent | 05c10c9bf77db2a9e37e61d1953ef0150289322d (diff) | |
Merge branch '40122-only-one-note-webhook-is-triggered-when-a-comment-with-time-spent-is-added' into 'master'
Resolve "Only one note webhook is triggered when a comment with time spent is added"
Closes #40122
See merge request gitlab-org/gitlab-ce!15381
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/hook_data/issue_builder.rb | 1 | ||||
| -rw-r--r-- | lib/gitlab/hook_data/merge_request_builder.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/hook_data/issue_builder.rb b/lib/gitlab/hook_data/issue_builder.rb index 196f2b6b34c..e29dd0d5b0e 100644 --- a/lib/gitlab/hook_data/issue_builder.rb +++ b/lib/gitlab/hook_data/issue_builder.rb @@ -28,6 +28,7 @@ module Gitlab SAFE_HOOK_RELATIONS = %i[ assignees labels + total_time_spent ].freeze attr_accessor :issue diff --git a/lib/gitlab/hook_data/merge_request_builder.rb b/lib/gitlab/hook_data/merge_request_builder.rb index 503452c8ff3..ae9b68eb648 100644 --- a/lib/gitlab/hook_data/merge_request_builder.rb +++ b/lib/gitlab/hook_data/merge_request_builder.rb @@ -33,6 +33,7 @@ module Gitlab SAFE_HOOK_RELATIONS = %i[ assignee labels + total_time_spent ].freeze attr_accessor :merge_request |