summaryrefslogtreecommitdiff
path: root/app/models/ci/trigger.rb
diff options
context:
space:
mode:
authorZ.J. van de Weg <git@zjvandeweg.nl>2017-04-07 15:56:08 +0200
committerZ.J. van de Weg <git@zjvandeweg.nl>2017-04-11 13:14:15 +0200
commit962bf01e69add14bceb3a901a143fcfba486abf3 (patch)
tree58e19fa5081a6aa1a0f34614eec785075905e9eb /app/models/ci/trigger.rb
parentc98add157732004d9a2eaa39770edf84eaca6896 (diff)
downloadgitlab-ce-962bf01e69add14bceb3a901a143fcfba486abf3.tar.gz
Add foreign key on trigger requestszj-fk-ci-triggers
I started out as I missed the foreign key on ci_triggers and projects. However, it seemed Yorick caught this already on gitlab-org/gitlab-ce!9388. Still I found a missing foreign key, between the trigger requests and triggers. This commit adds it, and removes the depend: :destroy on the Rails model Ci::Triggers
Diffstat (limited to 'app/models/ci/trigger.rb')
-rw-r--r--app/models/ci/trigger.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/ci/trigger.rb b/app/models/ci/trigger.rb
index b59e235c425..2f64f70685a 100644
--- a/app/models/ci/trigger.rb
+++ b/app/models/ci/trigger.rb
@@ -7,7 +7,7 @@ module Ci
belongs_to :project
belongs_to :owner, class_name: "User"
- has_many :trigger_requests, dependent: :destroy
+ has_many :trigger_requests
has_one :trigger_schedule, dependent: :destroy
validates :token, presence: true, uniqueness: true