diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-08-23 22:29:02 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-08-23 22:29:02 +0000 |
| commit | 19dfd9e9d6cf8c260dea6a339b1842fc2399729e (patch) | |
| tree | 2324095286769992803d2cfdffc5b2b8b34d204b | |
| parent | cdf87fe890a589da2c73e2f758e98f1c014d7953 (diff) | |
| parent | 597f9c12bbd9954f5a8b2580cfa34a3afcd31d86 (diff) | |
| download | gitlab-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
| -rw-r--r-- | app/models/project.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/use_full_path_in_project_avatar_url_webhook.yml | 5 |
2 files changed, 6 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, 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 |