diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-11-20 14:16:04 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-11-20 14:16:04 +0200 |
| commit | 9f65c274efbebf569b9d5576a33eabebda31e7e9 (patch) | |
| tree | 2f8e5be5f9c775c578e3f8cac970cd96cc47be16 /app/models | |
| parent | 406a0c809b3c10d8fb2754cf626094b98ee78aeb (diff) | |
| download | gitlab-ce-9f65c274efbebf569b9d5576a33eabebda31e7e9.tar.gz | |
Fix ci service creation logic
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/gitlab_ci_service.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/models/gitlab_ci_service.rb b/app/models/gitlab_ci_service.rb index f5734dc2820..020dc868841 100644 --- a/app/models/gitlab_ci_service.rb +++ b/app/models/gitlab_ci_service.rb @@ -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 |