diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-22 21:06:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-22 21:06:35 +0300 |
| commit | 24fe7aa2aa199b2aace0cfec26d744f51d7e2167 (patch) | |
| tree | 65eea9b7eba812dc2636aba1bfc885f12d38f774 /app/models | |
| parent | 6653aab95dfdfd260e8814e7499cc2345f451f99 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/project.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 3525f37f8d5..9c157b344e8 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -76,6 +76,10 @@ class Project < ApplicationRecord delegate :no_import?, to: :import_state, allow_nil: true + # TODO: remove once GitLab 12.5 is released + # https://gitlab.com/gitlab-org/gitlab/issues/34638 + self.ignored_columns += %i[merge_requests_require_code_owner_approval] + default_value_for :archived, false default_value_for :resolve_outdated_diff_discussions, false default_value_for :container_registry_enabled, gitlab_config_features.container_registry |