summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-23 21:07:52 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-23 21:07:52 +0000
commit33e1622bfe5afb2eea08ff06e44de490383a93e3 (patch)
tree121a36cbcf1488fe3e39bead16f0ad591b8e5dda /app
parent9f2d4a6490ea2ac9af8b640a507c8aff9ef220e8 (diff)
downloadgitlab-ce-33e1622bfe5afb2eea08ff06e44de490383a93e3.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r--app/models/project.rb4
1 files changed, 0 insertions, 4 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index 9062377943f..ba30a1f586a 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -63,10 +63,6 @@ class Project < ApplicationRecord
cache_markdown_field :description, pipeline: :description
- # TODO: remove once GitLab 12.5 is released
- # https://gitlab.com/gitlab-org/gitlab/issues/34638
- ignore_column :merge_requests_require_code_owner_approval, remove_after: '2019-12-01', remove_with: '12.6'
-
default_value_for :archived, false
default_value_for :resolve_outdated_diff_discussions, false
default_value_for :container_registry_enabled, gitlab_config_features.container_registry