diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 18:07:31 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 18:07:31 +0000 |
| commit | d91f5211693e913da5df110b8de841fad87e3653 (patch) | |
| tree | d1483aeb8fe3d2b9579b0e44f2e74979c4b8d17a /app/models/project_ci_cd_setting.rb | |
| parent | c859c3bfd242288065fe5e2d887f7204f09e2335 (diff) | |
| download | gitlab-ce-d91f5211693e913da5df110b8de841fad87e3653.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 | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/app/models/project_ci_cd_setting.rb b/app/models/project_ci_cd_setting.rb index 1dd65c76258..a495d34c07c 100644 --- a/app/models/project_ci_cd_setting.rb +++ b/app/models/project_ci_cd_setting.rb @@ -1,9 +1,6 @@ # frozen_string_literal: true 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 # The version of the schema that first introduced this model/table. |