summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-08-23 22:29:02 +0000
committerRobert Speicher <robert@gitlab.com>2017-08-23 22:29:02 +0000
commit19dfd9e9d6cf8c260dea6a339b1842fc2399729e (patch)
tree2324095286769992803d2cfdffc5b2b8b34d204b /app
parentcdf87fe890a589da2c73e2f758e98f1c014d7953 (diff)
parent597f9c12bbd9954f5a8b2580cfa34a3afcd31d86 (diff)
downloadgitlab-ce-19dfd9e9d6cf8c260dea6a339b1842fc2399729e.tar.gz
Merge branch 'use_full_path_in_project_avatar_url_webhook' into 'master'
Use full path of project's avatar in webhooks Closes #36539 See merge request !13649
Diffstat (limited to 'app')
-rw-r--r--app/models/project.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index 3118a480f7b..0baed3eacc8 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1017,7 +1017,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,