diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-01 06:06:11 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-01 06:06:11 +0000 |
| commit | 864475536355651a9f7caa5b1606aa5640424ec3 (patch) | |
| tree | 1dc80c96ddf3f9049c4a163b4c49f052a9b1a4ad /app/models/project_ci_cd_setting.rb | |
| parent | 7ddd5846999029916b2b6d8560b5b0f02ec0f6ea (diff) | |
| download | gitlab-ce-864475536355651a9f7caa5b1606aa5640424ec3.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/project_ci_cd_setting.rb')
| -rw-r--r-- | app/models/project_ci_cd_setting.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/project_ci_cd_setting.rb b/app/models/project_ci_cd_setting.rb index d089a004d3d..b292d39dae7 100644 --- a/app/models/project_ci_cd_setting.rb +++ b/app/models/project_ci_cd_setting.rb @@ -1,9 +1,10 @@ # frozen_string_literal: true class ProjectCiCdSetting < ApplicationRecord - # TODO: remove once GitLab 12.7 is released + include IgnorableColumns # https://gitlab.com/gitlab-org/gitlab/issues/36651 - self.ignored_columns += %i[merge_trains_enabled] + ignore_column :merge_trains_enabled, remove_with: '12.7', remove_after: '2019-12-22' + belongs_to :project, inverse_of: :ci_cd_settings # The version of the schema that first introduced this model/table. |