diff options
| author | Marin Jankovski <marin@gitlab.com> | 2018-01-19 15:07:40 +0300 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2018-01-19 15:07:40 +0300 |
| commit | 418cb3714af8337cc7b727098dd5e5d56e387e54 (patch) | |
| tree | 93c7184ea4111354c01f1fad513c2e4f41e35a62 /app/models/ci/trigger.rb | |
| parent | 797ffb4a784d1183f2c6b9e67cec55fd3424dec8 (diff) | |
| parent | 3541a259327061d10c04a5b287aca9349e0c7860 (diff) | |
Merge branch '10-4-stable-prepare-rc8' into '10-4-stable'
Prepare 10.4 RC8 release
See merge request gitlab-org/gitlab-ce!16557
Diffstat (limited to 'app/models/ci/trigger.rb')
| -rw-r--r-- | app/models/ci/trigger.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/ci/trigger.rb b/app/models/ci/trigger.rb index b5290bcaf53..aa065e33739 100644 --- a/app/models/ci/trigger.rb +++ b/app/models/ci/trigger.rb @@ -1,8 +1,9 @@ module Ci class Trigger < ActiveRecord::Base extend Gitlab::Ci::Model + include IgnorableColumn - acts_as_paranoid + ignore_column :deleted_at belongs_to :project belongs_to :owner, class_name: "User" |