diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2017-04-11 14:16:33 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2017-04-11 14:16:33 +0000 |
| commit | 568052b0c637f99462855c043819aa0dd347ff06 (patch) | |
| tree | 891a142b8fe451ec5ee0828278113ef3b11dc0f0 /app | |
| parent | a9ff23407c9df7da171b4ad07d40ff8a3f4fac24 (diff) | |
| parent | 962bf01e69add14bceb3a901a143fcfba486abf3 (diff) | |
| download | gitlab-ce-568052b0c637f99462855c043819aa0dd347ff06.tar.gz | |
Merge branch 'zj-fk-ci-triggers' into 'master'
Add foreign key on trigger requests
See merge request !10537
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/ci/trigger.rb | 2 |
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 |