summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorFelipe Artur <felipefac@gmail.com>2016-05-10 12:26:24 -0300
committerFelipe Artur <felipefac@gmail.com>2016-05-19 20:08:08 -0400
commit260a915cb0aa163bd282557b5584ed368cd9983a (patch)
tree5c257772e7b3fc6ecc991cc29ffab461f04eaf1b /db
parent98d8e3fe9ff4d120469378490c41381ae751597e (diff)
downloadgitlab-ce-260a915cb0aa163bd282557b5584ed368cd9983a.tar.gz
Fix group visibility level migration in case all visibility levels are restrictedissue_14632
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20160308212903_add_default_group_visibility_to_application_settings.rb4
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