From 2b4deed9eab68e03b21a0c71f2d0ea82f66a62cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= <alejorro70@gmail.com>
Date: Mon, 14 Nov 2016 12:38:25 -0300
Subject: [PATCH] Use `default_value_for` to handle null values in
only_allow_merge_if_all_discussions_are_resolved
---
app/models/project.rb | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/app/models/project.rb b/app/models/project.rb
index 94aabafce20..bab2f0c53ca 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -35,6 +35,7 @@ class Project < ActiveRecord::Base
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 @@ class Project < ActiveRecord::Base
end
end
- def only_allow_merge_if_all_discussions_are_resolved
- super || false
- end
-
private
def pushes_since_gc_redis_key
--
GitLab