diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-07-16 21:13:18 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-07-16 21:13:18 +0000 |
| commit | dbb71847bcb8356fafd8b11832ccaf534e37344e (patch) | |
| tree | 2221d5957f1f24ebf0bcd20b451a87ce10e6537d /app/models/ci | |
| parent | ef3f6386421ad382ddf989523c00a4385b4d0431 (diff) | |
| parent | 3d171dc27163274b181fc0481065c681abae3186 (diff) | |
| download | gitlab-ce-dbb71847bcb8356fafd8b11832ccaf534e37344e.tar.gz | |
Merge branch 'dz-remove-old-ignore-column' into 'master'
Remove old ignore_column in AR models
See merge request gitlab-org/gitlab-ce!30725
Diffstat (limited to 'app/models/ci')
| -rw-r--r-- | app/models/ci/pipeline_schedule.rb | 3 | ||||
| -rw-r--r-- | app/models/ci/trigger.rb | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/app/models/ci/pipeline_schedule.rb b/app/models/ci/pipeline_schedule.rb index ba8cea0cea9..42d4e86fe8d 100644 --- a/app/models/ci/pipeline_schedule.rb +++ b/app/models/ci/pipeline_schedule.rb @@ -4,11 +4,8 @@ module Ci class PipelineSchedule < ApplicationRecord extend Gitlab::Ci::Model include Importable - include IgnorableColumn include StripAttribute - ignore_column :deleted_at - belongs_to :project belongs_to :owner, class_name: 'User' has_one :last_pipeline, -> { order(id: :desc) }, class_name: 'Ci::Pipeline' diff --git a/app/models/ci/trigger.rb b/app/models/ci/trigger.rb index dc9965ce08c..8792c5cf98b 100644 --- a/app/models/ci/trigger.rb +++ b/app/models/ci/trigger.rb @@ -3,11 +3,8 @@ module Ci class Trigger < ApplicationRecord extend Gitlab::Ci::Model - include IgnorableColumn include Presentable - ignore_column :deleted_at - belongs_to :project belongs_to :owner, class_name: "User" |