diff options
| author | Douwe Maan <douwe@gitlab.com> | 2019-07-24 18:36:44 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2019-07-24 18:36:44 +0000 |
| commit | b0149921938d4cae99c7359c861139519ed4ca0c (patch) | |
| tree | 76f2fcac56703476a0c7fd67665be869ba9ab1d6 | |
| parent | 0d538e44aff066372ecd9d10ac6786681bc347c9 (diff) | |
| parent | f6bfd51deaf1b13f850536be7b2ddee17b1e3a7d (diff) | |
| download | gitlab-ce-b0149921938d4cae99c7359c861139519ed4ca0c.tar.gz | |
Merge branch '62128-remove-ignore-rule-for-project-auto-devops-domain' into 'master'
Remove ignore rule for ProjectAutoDevops#domain
See merge request gitlab-org/gitlab-ce!30989
| -rw-r--r-- | app/models/project_auto_devops.rb | 4 | ||||
| -rw-r--r-- | spec/models/project_auto_devops_spec.rb | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/app/models/project_auto_devops.rb b/app/models/project_auto_devops.rb index f39f54f0434..e11d0c48b4b 100644 --- a/app/models/project_auto_devops.rb +++ b/app/models/project_auto_devops.rb @@ -1,10 +1,6 @@ # frozen_string_literal: true class ProjectAutoDevops < ApplicationRecord - include IgnorableColumn - - ignore_column :domain - belongs_to :project, inverse_of: :auto_devops enum deploy_strategy: { diff --git a/spec/models/project_auto_devops_spec.rb b/spec/models/project_auto_devops_spec.rb index 7bdd2367a68..da9e56ef897 100644 --- a/spec/models/project_auto_devops_spec.rb +++ b/spec/models/project_auto_devops_spec.rb @@ -15,7 +15,7 @@ describe ProjectAutoDevops do it { is_expected.to respond_to(:updated_at) } describe '#predefined_variables' do - let(:auto_devops) { build_stubbed(:project_auto_devops, project: project, domain: domain) } + let(:auto_devops) { build_stubbed(:project_auto_devops, project: project) } context 'when deploy_strategy is manual' do let(:auto_devops) { build_stubbed(:project_auto_devops, :manual_deployment, project: project) } |