Merge branch 'dz-remove-old-ignore-column' into 'master'
Remove old ignore_column in AR models See merge request gitlab-org/gitlab-ce!30725
This commit is contained in:
commit
dbb71847bc
6 changed files with 0 additions and 20 deletions
|
@ -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'
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -13,11 +13,8 @@ class Issue < ApplicationRecord
|
|||
include RelativePositioning
|
||||
include TimeTrackable
|
||||
include ThrottledTouch
|
||||
include IgnorableColumn
|
||||
include LabelEventable
|
||||
|
||||
ignore_column :assignee_id, :branch_name, :deleted_at
|
||||
|
||||
DueDateStruct = Struct.new(:title, :name).freeze
|
||||
NoDueDate = DueDateStruct.new('No Due Date', '0').freeze
|
||||
AnyDueDate = DueDateStruct.new('Any Due Date', '').freeze
|
||||
|
|
|
@ -7,7 +7,6 @@ class MergeRequest < ApplicationRecord
|
|||
include Noteable
|
||||
include Referable
|
||||
include Presentable
|
||||
include IgnorableColumn
|
||||
include TimeTrackable
|
||||
include ManualInverseAssociation
|
||||
include EachBatch
|
||||
|
@ -24,10 +23,6 @@ class MergeRequest < ApplicationRecord
|
|||
|
||||
SORTING_PREFERENCE_FIELD = :merge_requests_sort
|
||||
|
||||
ignore_column :locked_at,
|
||||
:ref_fetched,
|
||||
:deleted_at
|
||||
|
||||
belongs_to :target_project, class_name: "Project"
|
||||
belongs_to :source_project, class_name: "Project"
|
||||
belongs_to :merge_user, class_name: "User"
|
||||
|
|
|
@ -8,13 +8,10 @@ class Namespace < ApplicationRecord
|
|||
include AfterCommitQueue
|
||||
include Storage::LegacyNamespace
|
||||
include Gitlab::SQL::Pattern
|
||||
include IgnorableColumn
|
||||
include FeatureGate
|
||||
include FromUnion
|
||||
include Gitlab::Utils::StrongMemoize
|
||||
|
||||
ignore_column :deleted_at
|
||||
|
||||
# Prevent users from creating unreasonably deep level of nesting.
|
||||
# The number 20 was taken based on maximum nesting level of
|
||||
# Android repo (15) + some extra backup.
|
||||
|
|
|
@ -31,7 +31,6 @@ class Project < ApplicationRecord
|
|||
include FeatureGate
|
||||
include OptionallySearch
|
||||
include FromUnion
|
||||
include IgnorableColumn
|
||||
extend Gitlab::Cache::RequestCache
|
||||
|
||||
extend Gitlab::ConfigHelper
|
||||
|
@ -56,8 +55,6 @@ class Project < ApplicationRecord
|
|||
VALID_MIRROR_PORTS = [22, 80, 443].freeze
|
||||
VALID_MIRROR_PROTOCOLS = %w(http https ssh git).freeze
|
||||
|
||||
ignore_column :import_status, :import_jid, :import_error
|
||||
|
||||
cache_markdown_field :description, pipeline: :description
|
||||
|
||||
delegate :feature_available?, :builds_enabled?, :wiki_enabled?,
|
||||
|
|
Loading…
Reference in a new issue