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

Merge branch 'fix-drone-service-hook' into 'master'
da0b9cb3 · Stan Hu · ba4dc176 · ad1f451f · da0b9cb3
Commit da0b9cb3 authored Nov 20, 2015 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

drone_ci_service.rb app/models/project_services/drone_ci_service.rb +2 -0

No files found.
--- 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