Skip to content

G
gitlab-ce
Commit 90720982 authored by Gabriel Mazetto's avatar Gabriel Mazetto
Browse files
Options

Fixed CiServices validation

parent f479ed30
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
app/models/project_services/bamboo_service.rb
View file @ 90720982
...@@ -27,10 +27,10 @@ class BambooService < CiService ...@@ -27,10 +27,10 @@ class BambooService < CiService
validates :build_key, presence: true, if: :activated? validates :build_key, presence: true, if: :activated?
validates :username, validates :username,
presence: true, presence: true,
if: ->(service) { service.activated? && service.password? } if: ->(service) { service.activated? && service.password }
validates :password, validates :password,
presence: true, presence: true,
if: ->(service) { service.activated? && service.username? } if: ->(service) { service.activated? && service.username }
attr_accessor :response attr_accessor :response
......
app/models/project_services/teamcity_service.rb
View file @ 90720982
...@@ -27,10 +27,10 @@ class TeamcityService < CiService ...@@ -27,10 +27,10 @@ class TeamcityService < CiService
validates :build_type, presence: true, if: :activated? validates :build_type, presence: true, if: :activated?
validates :username, validates :username,
presence: true, presence: true,
if: ->(service) { service.activated? && service.password? } if: ->(service) { service.activated? && service.password }
validates :password, validates :password,
presence: true, presence: true,
if: ->(service) { service.activated? && service.username? } if: ->(service) { service.activated? && service.username }
attr_accessor :response attr_accessor :response
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7