deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix ci service creation logic

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-11-20 14:16:04 +02:00
parent 406a0c809b
commit 9f65c274ef
3 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/models/gitlab_ci_service.rb
View file

@ -14,12 +14,16 @@
class GitlabCiService < Service
attr_accessible :project_url
validates :project_url, presence: true
validates :token, presence: true
validates :project_url, presence: true, if: :activated?
validates :token, presence: true, if: :activated?
delegate :execute, to: :service_hook, prefix: nil
after_save :compose_service_hook
after_save :compose_service_hook, if: :activated?
def activated?
active
end
def compose_service_hook
hook = service_hook || build_service_hook