From afe1ff413dd4a6dd635afd26f7b57145abe4ad2b Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 15 May 2014 11:20:25 +0300 Subject: [PATCH] Specify project URL for Jenkins service Signed-off-by: Dmitriy Zaporozhets --- app/models/project.rb | 2 +- app/models/project_services/jenkins_service.rb | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/models/project.rb b/app/models/project.rb index 813ae4fa6c..4389188811 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -335,7 +335,7 @@ class Project < ActiveRecord::Base end def ci_service - services.select(&:activated?).first + @ci_service ||= services.select(&:activated?).first end def jira_tracker? diff --git a/app/models/project_services/jenkins_service.rb b/app/models/project_services/jenkins_service.rb index c8cac62a01..fd7a3ef0a9 100644 --- a/app/models/project_services/jenkins_service.rb +++ b/app/models/project_services/jenkins_service.rb @@ -28,7 +28,8 @@ class JenkinsService < CiService def compose_service_hook hook = service_hook || build_service_hook - hook.url = [project_url, "/gitlab/build_now"].join("") + jenkins_url = project_url.sub(/job\/.*/, '') + hook.url = jenkins_url + "/gitlab/build_now" hook.save end @@ -46,12 +47,12 @@ class JenkinsService < CiService def fields [ - { type: 'text', name: 'project_url', placeholder: 'Jenkins server URL like http://jenkins.example.com/' } + { type: 'text', name: 'project_url', placeholder: 'Jenkins project URL like http://jenkins.example.com/job/my-project/' } ] end def build_page sha - project_url + "/job/test1/scm/bySHA1/#{sha}" + project_url + "/scm/bySHA1/#{sha}" end def commit_status sha