home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity

Specify project URL for Jenkins service

Browse Source 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets
2014-05-15 11:20:25 +03:00
parent b16d77c3e0
commit afe1ff413d
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/models/project.rb
+1 -1
View File
@@ -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?
app/models/project_services/jenkins_service.rb
+4 -3
View File
@@ -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