summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-05 19:42:09 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-05 19:42:09 +0300
commit3e11a6b714e2da027f0869a984bcb1733276d332 (patch)
treebc022e4a44075009e04e959f30d0929844e178af /app/models
parent1e48c8c1b531c088a744287dd81e855c05c081e8 (diff)
downloadgitlab-ci-3e11a6b714e2da027f0869a984bcb1733276d332.tar.gz
Improve webhooks migration and association
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/models')
-rw-r--r--app/models/project.rb2
-rw-r--r--app/models/web_hook.rb3
2 files changed, 3 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index e6c7e48..0ed2295 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -31,7 +31,7 @@ class Project < ActiveRecord::Base
has_many :builds, dependent: :destroy
has_many :runner_projects, dependent: :destroy
has_many :runners, through: :runner_projects
- has_many :web_hooks
+ has_many :web_hooks, dependent: :destroy
#
# Validations
diff --git a/app/models/web_hook.rb b/app/models/web_hook.rb
index dc1d1db..1d16961 100644
--- a/app/models/web_hook.rb
+++ b/app/models/web_hook.rb
@@ -1,7 +1,8 @@
class WebHook < ActiveRecord::Base
- belongs_to :project
include HTTParty
+ belongs_to :project
+
attr_accessible :url
# HTTParty timeout