Commit 16a1ff38 authored by Sean Carroll's avatar Sean Carroll Committed by Douglas Barbosa Alexandre

Mark project_ci_cd_settings.merge_trains_enabled for removal

parent fbcdd6f7
# frozen_string_literal: true # frozen_string_literal: true
class ProjectCiCdSetting < ApplicationRecord class ProjectCiCdSetting < ApplicationRecord
# TODO: remove once GitLab 12.7 is released
# https://gitlab.com/gitlab-org/gitlab/issues/36651
self.ignored_columns += %i[merge_trains_enabled]
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.
......
---
title: Ignore project_ci_cd_settings.merge_trains_enabled column
merge_request: 19695
author:
type: added
...@@ -11,7 +11,7 @@ describe MergeTrains::CreatePipelineService do ...@@ -11,7 +11,7 @@ describe MergeTrains::CreatePipelineService do
before do before do
project.add_maintainer(maintainer) project.add_maintainer(maintainer)
stub_licensed_features(merge_pipelines: true, merge_trains: true) stub_licensed_features(merge_pipelines: true, merge_trains: true)
project.update!(merge_pipelines_enabled: true, merge_trains_enabled: true) project.update!(merge_pipelines_enabled: true)
end end
describe '#execute' do describe '#execute' do
......
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