Commit d9300f19 authored by Andreas Brandl's avatar Andreas Brandl

Merge branch '36461-remove-mark-on-project_ci_cd_settings-merge_trains_enabled' into 'master'

Remove mark on project_ci_cd_settings.merge_trains_enabled

Closes #36461

See merge request gitlab-org/gitlab!23147
parents 27f08681 ee37004c
# frozen_string_literal: true # frozen_string_literal: true
class ProjectCiCdSetting < ApplicationRecord class ProjectCiCdSetting < ApplicationRecord
include IgnorableColumns
# https://gitlab.com/gitlab-org/gitlab/issues/36651
ignore_column :merge_trains_enabled, remove_with: '12.7', remove_after: '2019-12-22'
belongs_to :project, inverse_of: :ci_cd_settings belongs_to :project, inverse_of: :ci_cd_settings
# The version of the schema that first introduced this model/table. # The version of the schema that first introduced this model/table.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment