summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorblackst0ne <blackst0ne.ru@gmail.com>2017-08-18 16:42:52 +1100
committerblackst0ne <blackst0ne.ru@gmail.com>2017-08-18 16:42:52 +1100
commit597f9c12bbd9954f5a8b2580cfa34a3afcd31d86 (patch)
tree258f72f82f711cdef4b23d03ad871b2b74fd7da9
parentdad8fae744d8dd384d0da220663bfa8814a43dfc (diff)
downloadgitlab-ce-597f9c12bbd9954f5a8b2580cfa34a3afcd31d86.tar.gz
Use full path of project's avatar in webhooks
-rw-r--r--app/models/project.rb2
-rw-r--r--changelogs/unreleased/use_full_path_in_project_avatar_url_webhook.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index be248bc99e1..e0085302867 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1009,7 +1009,7 @@ class Project < ActiveRecord::Base
name: name,
description: description,
web_url: web_url,
- avatar_url: avatar_url,
+ avatar_url: avatar_url(only_path: false),
git_ssh_url: ssh_url_to_repo,
git_http_url: http_url_to_repo,
namespace: namespace.name,
diff --git a/changelogs/unreleased/use_full_path_in_project_avatar_url_webhook.yml b/changelogs/unreleased/use_full_path_in_project_avatar_url_webhook.yml
new file mode 100644
index 00000000000..0c3acce1455
--- /dev/null
+++ b/changelogs/unreleased/use_full_path_in_project_avatar_url_webhook.yml
@@ -0,0 +1,5 @@
+---
+title: Use full path of project's avatar in webhooks
+merge_request: 13649
+author: Vitaliy @blackst0ne Klachkov
+type: changed