Commit 40b9fe8f authored by Mayra Cabrera's avatar Mayra Cabrera

Merge branch...

Merge branch '34638-remove-ignoring-of-merge_requests_require_code_owner_approval-column-on-projects' into 'master'

Resolve "Remove ignoring of `merge_requests_require_code_owner_approval` column on projects"

See merge request gitlab-org/gitlab!22197
parents 19a339be 14d94fe5
...@@ -63,10 +63,6 @@ class Project < ApplicationRecord ...@@ -63,10 +63,6 @@ class Project < ApplicationRecord
cache_markdown_field :description, pipeline: :description 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 :archived, false
default_value_for :resolve_outdated_diff_discussions, false default_value_for :resolve_outdated_diff_discussions, false
default_value_for :container_registry_enabled, gitlab_config_features.container_registry default_value_for :container_registry_enabled, gitlab_config_features.container_registry
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment