Commit 2b4deed9 authored by Alejandro Rodríguez's avatar Alejandro Rodríguez
Browse files

Use `default_value_for` to handle null values in only_allow_merge_if_all_discussions_are_resolved

parent 0f216ea1f65d
......@@ -35,6 +35,7 @@ class BoardLimitExceeded < StandardError; end
default_value_for :builds_enabled, gitlab_config_features.builds
default_value_for :wiki_enabled, gitlab_config_features.wiki
default_value_for :snippets_enabled, gitlab_config_features.snippets
default_value_for :only_allow_merge_if_all_discussions_are_resolved, false
after_create :ensure_dir_exist
after_create :create_project_feature, unless: :project_feature
......@@ -1334,10 +1335,6 @@ def environments_for(ref, commit, with_tags: false)
end
end
def only_allow_merge_if_all_discussions_are_resolved
super || false
end
private
def pushes_since_gc_redis_key
......
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