diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-11-20 20:05:56 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-11-21 11:11:44 -0500 |
| commit | 0df5340036c3510bc7bad77c4db4704f40f2621e (patch) | |
| tree | 2a283f5cd4d1eb01a8f620a609ba87007ca1af20 | |
| parent | ae36d23497cf1f51e573524c1ef9477375c0f528 (diff) | |
| download | gitlab-ce-0df5340036c3510bc7bad77c4db4704f40f2621e.tar.gz | |
Merge branch 'fix-drone-service-hook' into 'master'
Fix Drone web hook URL not being updated
Fixes regression of !1774: fixes Drone Web hook for both service templates and project services.
See merge request !1856
| -rw-r--r-- | app/models/project_services/drone_ci_service.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/project_services/drone_ci_service.rb b/app/models/project_services/drone_ci_service.rb index c240213200d..127684bd274 100644 --- a/app/models/project_services/drone_ci_service.rb +++ b/app/models/project_services/drone_ci_service.rb @@ -32,6 +32,8 @@ class DroneCiService < CiService def compose_service_hook hook = service_hook || build_service_hook + # If using a service template, project may not be available + hook.url = [drone_url, "/api/hook", "?owner=#{project.namespace.path}", "&name=#{project.path}", "&access_token=#{token}"].join if project hook.enable_ssl_verification = enable_ssl_verification hook.save end |