Port of ccr/6274/add_weight_to_payload to CE
This commit is contained in:
parent
edf7d1d4c7
commit
28ab966210
|
@ -28,7 +28,7 @@ module Gitlab
|
|||
end
|
||||
|
||||
def safe_keys
|
||||
issuable_builder::SAFE_HOOK_ATTRIBUTES + issuable_builder::SAFE_HOOK_RELATIONS
|
||||
issuable_builder.safe_hook_attributes + issuable_builder::SAFE_HOOK_RELATIONS
|
||||
end
|
||||
|
||||
private
|
||||
|
|
|
@ -1,50 +1,52 @@
|
|||
module Gitlab
|
||||
module HookData
|
||||
class IssueBuilder < BaseBuilder
|
||||
SAFE_HOOK_ATTRIBUTES = %i[
|
||||
assignee_id
|
||||
author_id
|
||||
closed_at
|
||||
confidential
|
||||
created_at
|
||||
description
|
||||
due_date
|
||||
id
|
||||
iid
|
||||
last_edited_at
|
||||
last_edited_by_id
|
||||
milestone_id
|
||||
moved_to_id
|
||||
project_id
|
||||
relative_position
|
||||
state
|
||||
time_estimate
|
||||
title
|
||||
updated_at
|
||||
updated_by_id
|
||||
].freeze
|
||||
|
||||
SAFE_HOOK_RELATIONS = %i[
|
||||
assignees
|
||||
labels
|
||||
total_time_spent
|
||||
].freeze
|
||||
|
||||
def self.safe_hook_attributes
|
||||
%i[
|
||||
assignee_id
|
||||
author_id
|
||||
closed_at
|
||||
confidential
|
||||
created_at
|
||||
description
|
||||
due_date
|
||||
id
|
||||
iid
|
||||
last_edited_at
|
||||
last_edited_by_id
|
||||
milestone_id
|
||||
moved_to_id
|
||||
project_id
|
||||
relative_position
|
||||
state
|
||||
time_estimate
|
||||
title
|
||||
updated_at
|
||||
updated_by_id
|
||||
].freeze
|
||||
end
|
||||
|
||||
alias_method :issue, :object
|
||||
|
||||
def build
|
||||
attrs = {
|
||||
description: absolute_image_urls(issue.description),
|
||||
url: Gitlab::UrlBuilder.build(issue),
|
||||
total_time_spent: issue.total_time_spent,
|
||||
human_total_time_spent: issue.human_total_time_spent,
|
||||
human_time_estimate: issue.human_time_estimate,
|
||||
assignee_ids: issue.assignee_ids,
|
||||
assignee_id: issue.assignee_ids.first # This key is deprecated
|
||||
description: absolute_image_urls(issue.description),
|
||||
url: Gitlab::UrlBuilder.build(issue),
|
||||
total_time_spent: issue.total_time_spent,
|
||||
human_total_time_spent: issue.human_total_time_spent,
|
||||
human_time_estimate: issue.human_time_estimate,
|
||||
assignee_ids: issue.assignee_ids,
|
||||
assignee_id: issue.assignee_ids.first # This key is deprecated
|
||||
}
|
||||
|
||||
issue.attributes.with_indifferent_access.slice(*SAFE_HOOK_ATTRIBUTES)
|
||||
.merge!(attrs)
|
||||
issue.attributes.with_indifferent_access.slice(*self.class.safe_hook_attributes)
|
||||
.merge!(attrs)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,33 +1,35 @@
|
|||
module Gitlab
|
||||
module HookData
|
||||
class MergeRequestBuilder < BaseBuilder
|
||||
SAFE_HOOK_ATTRIBUTES = %i[
|
||||
assignee_id
|
||||
author_id
|
||||
created_at
|
||||
description
|
||||
head_pipeline_id
|
||||
id
|
||||
iid
|
||||
last_edited_at
|
||||
last_edited_by_id
|
||||
merge_commit_sha
|
||||
merge_error
|
||||
merge_params
|
||||
merge_status
|
||||
merge_user_id
|
||||
merge_when_pipeline_succeeds
|
||||
milestone_id
|
||||
source_branch
|
||||
source_project_id
|
||||
state
|
||||
target_branch
|
||||
target_project_id
|
||||
time_estimate
|
||||
title
|
||||
updated_at
|
||||
updated_by_id
|
||||
].freeze
|
||||
def self.safe_hook_attributes
|
||||
%i[
|
||||
assignee_id
|
||||
author_id
|
||||
created_at
|
||||
description
|
||||
head_pipeline_id
|
||||
id
|
||||
iid
|
||||
last_edited_at
|
||||
last_edited_by_id
|
||||
merge_commit_sha
|
||||
merge_error
|
||||
merge_params
|
||||
merge_status
|
||||
merge_user_id
|
||||
merge_when_pipeline_succeeds
|
||||
milestone_id
|
||||
source_branch
|
||||
source_project_id
|
||||
state
|
||||
target_branch
|
||||
target_project_id
|
||||
time_estimate
|
||||
title
|
||||
updated_at
|
||||
updated_by_id
|
||||
].freeze
|
||||
end
|
||||
|
||||
SAFE_HOOK_RELATIONS = %i[
|
||||
assignee
|
||||
|
@ -50,8 +52,8 @@ module Gitlab
|
|||
human_time_estimate: merge_request.human_time_estimate
|
||||
}
|
||||
|
||||
merge_request.attributes.with_indifferent_access.slice(*SAFE_HOOK_ATTRIBUTES)
|
||||
.merge!(attrs)
|
||||
merge_request.attributes.with_indifferent_access.slice(*self.class.safe_hook_attributes)
|
||||
.merge!(attrs)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue