diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-11-15 03:46:02 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-11-15 03:46:02 +0000 |
| commit | 64d094eecc7ac9617156438150d233f595451f71 (patch) | |
| tree | 16f7a2393129f94852a1a578cf27495fb0a663fb | |
| parent | f821013bf3c18b0bdbd5c898f368cd0b96bb92ba (diff) | |
| parent | 2b4deed9eab68e03b21a0c71f2d0ea82f66a62cd (diff) | |
| download | gitlab-ce-64d094eecc7ac9617156438150d233f595451f71.tar.gz | |
Merge branch 'fix-migration-changes' into 'master'
Use `default_value_for` to handle null values in only_allow_merge_if_all_discussions_are_resolved
Small style improvement for !7427
See merge request !7460
| -rw-r--r-- | app/models/project.rb | 5 |
1 files changed, 1 insertions, 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 |