summaryrefslogtreecommitdiff
path: root/app/models/service.rb
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2015-01-02 14:57:08 +0100
committerKamil Trzcinski <ayufan@ayufan.eu>2015-01-12 19:53:14 +0100
commit1a1f4eded6e9c65435f76aeb1e872664895c2d02 (patch)
treeb944d30d1301caa38c40f9a78017817a658581b3 /app/models/service.rb
parenta40989d27ea8a1c5d23dfd5b82f25e09527b2c80 (diff)
downloadgitlab-ci-1a1f4eded6e9c65435f76aeb1e872664895c2d02.tar.gz
Added Service and SlackService specs
Diffstat (limited to 'app/models/service.rb')
-rw-r--r--app/models/service.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/service.rb b/app/models/service.rb
index a9ef1aa..20a2c15 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -22,7 +22,6 @@ class Service < ActiveRecord::Base
after_initialize :initialize_properties
belongs_to :project
- has_one :service_hook
validates :project_id, presence: true
@@ -64,7 +63,7 @@ class Service < ActiveRecord::Base
end
def can_test?
- !project.builds.empty?
+ project.builds.any?
end
# Provide convenient accessor methods
@@ -73,10 +72,11 @@ class Service < ActiveRecord::Base
args.each do |arg|
class_eval %{
def #{arg}
- properties['#{arg}']
+ (properties || {})['#{arg}']
end
def #{arg}=(value)
+ self.properties ||= {}
self.properties['#{arg}'] = value
end
}