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:
authorSatish Perala <satish@cybrilla.com>2016-08-25 20:05:59 +0300
committerSean McGivern <sean@gitlab.com>2018-06-20 16:13:23 +0300
commit9170aab92e616a6f6d3ddfc4cf8326cba0e4a1a8 (patch)
treead2c13c7521fedb74f89693dd4561e92f92167db /lib/gitlab/hook_data
parentb349c01c6a71ac1f486b8ee86ce96ef48ac04ed8 (diff)
Passing absolute image urls in the markdown content in the webhooks
Diffstat (limited to 'lib/gitlab/hook_data')
-rw-r--r--lib/gitlab/hook_data/issue_builder.rb1
-rw-r--r--lib/gitlab/hook_data/merge_request_builder.rb1
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 f9b1a3caf5e..55dc84a60d4 100644
--- a/lib/gitlab/hook_data/issue_builder.rb
+++ b/lib/gitlab/hook_data/issue_builder.rb
@@ -38,6 +38,7 @@ module Gitlab
def build
attrs = {
+ description: MarkdownUtils.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,
diff --git a/lib/gitlab/hook_data/merge_request_builder.rb b/lib/gitlab/hook_data/merge_request_builder.rb
index aff786864f2..2dfc0435848 100644
--- a/lib/gitlab/hook_data/merge_request_builder.rb
+++ b/lib/gitlab/hook_data/merge_request_builder.rb
@@ -43,6 +43,7 @@ module Gitlab
def build
attrs = {
+ description: MarkdownUtils.absolute_image_urls(issue.description),
url: Gitlab::UrlBuilder.build(merge_request),
source: merge_request.source_project.try(:hook_attrs),
target: merge_request.target_project.hook_attrs,