Merge branch 'issue_14632' into 'master'

Fix group visibility level migration in case all visibility levels are restricted

fixes #14632 

See merge request !4107

1 files changed, 3 insertions, 1 deletions

diff --git a/db/migrate/20160308212903_add_default_group_visibility_to_application_settings.rb b/db/migrate/20160308212903_add_default_group_visibility_to_application_settings.rb
index 75de5f70fa2..72b862d67d2 100644
--- a/db/migrate/20160308212903_add_default_group_visibility_to_application_settings.rb
+++ b/db/migrate/20160308212903_add_default_group_visibility_to_application_settings.rb
@@ -7,7 +7,9 @@ class AddDefaultGroupVisibilityToApplicationSettings < ActiveRecord::Migration
     add_column :application_settings, :default_group_visibility, :integer
     # Unfortunately, this can't be a `default`, since we don't want the configuration specific
     # `allowed_visibility_level` to end up in schema.rb
-    execute("UPDATE application_settings SET default_group_visibility = #{allowed_visibility_level}")
+
+    visibility_level = allowed_visibility_level || Gitlab::VisibilityLevel::PRIVATE
+    execute("UPDATE application_settings SET default_group_visibility = #{visibility_level}")
   end
 
   def down