diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2017-04-11 20:01:39 +0000 |
|---|---|---|
| committer | Marcia Ramos <virtua.creative@gmail.com> | 2017-04-11 20:01:39 +0000 |
| commit | 40991fc3ce55bbfa87b6ed56515dcceb1e0e8dae (patch) | |
| tree | fdcaa7a99418411f3ef333106bd2d77879e007d7 /app/models/ci/trigger.rb | |
| parent | 85cfde8332d9d5d3280fcb0b9de8d56de2d29ed4 (diff) | |
| parent | 069c54a7d7a1d1d6ec1dc48c4212139eff6735df (diff) | |
| download | gitlab-ce-40991fc3ce55bbfa87b6ed56515dcceb1e0e8dae.tar.gz | |
fix conflictdocs-topic-auth
Diffstat (limited to 'app/models/ci/trigger.rb')
| -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 |