diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-11-10 19:49:46 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-11-10 19:49:46 +0000 |
| commit | abec87f4ac665efc1bfaf3d404b6f53ce02aba06 (patch) | |
| tree | aa8a52e125816626e4911d0d3835b53f5709d54b | |
| parent | f162ed7aeb3958938aaf213837ec0c4c4e90b014 (diff) | |
| parent | 5aa142212fc4fb7765aad801c1a25696fb752fba (diff) | |
| download | gitlab-ce-abec87f4ac665efc1bfaf3d404b6f53ce02aba06.tar.gz | |
Merge branch 'fix-drone-ci-template-save' into 'master'
Fix Drone CI service template not saving properly
This fixes an Error 500 when attempting to save a Drone CI template in the service template page. `hook.url` was not being used and depended upon a project when none existed.
/cc: @bugagazavr
Closes #3419
See merge request !1774
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/models/project_services/drone_ci_service.rb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index d82cab6f36c..7567e25b891 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.2.0 (unreleased) - Remove CSS property preventing hard tabs from rendering in Chromium 45 (Stan Hu) + - Fix Drone CI service template not saving properly (Stan Hu) - Added a GitLab specific profiling tool called "Sherlock" (see GitLab CE merge request #1749) - Upgrade gitlab_git to 7.2.20 and rugged to 0.23.3 (Stan Hu) - Improved performance of finding users by one of their Email addresses diff --git a/app/models/project_services/drone_ci_service.rb b/app/models/project_services/drone_ci_service.rb index c73c4b058a1..c240213200d 100644 --- a/app/models/project_services/drone_ci_service.rb +++ b/app/models/project_services/drone_ci_service.rb @@ -32,7 +32,6 @@ class DroneCiService < CiService def compose_service_hook hook = service_hook || build_service_hook - hook.url = [drone_url, "/api/hook", "?owner=#{project.namespace.path}", "&name=#{project.path}", "&access_token=#{token}"].join hook.enable_ssl_verification = enable_ssl_verification hook.save end |