Add specs and add visibility level to admin groups

3 files changed, 8 insertions, 25 deletions

diff --git a/db/migrate/20160301124843_add_visibility_level_to_groups.rb b/db/migrate/20160301124843_add_visibility_level_to_groups.rb
index cef553981e7..89b5ac19983 100644
--- a/db/migrate/20160301124843_add_visibility_level_to_groups.rb
+++ b/db/migrate/20160301124843_add_visibility_level_to_groups.rb
@@ -1,6 +1,12 @@
 class AddVisibilityLevelToGroups < ActiveRecord::Migration
   def change
     #All groups public by default
-    add_column :namespaces, :visibility_level, :integer, null: false, default: 20
+    add_column :namespaces, :visibility_level, :integer, null: false, default: allowed_visibility_level
+  end
+
+  def allowed_visibility_level
+    # TODO: Don't use `current_application_settings`
+    allowed_levels = Gitlab::VisibilityLevel.values - current_application_settings.restricted_visibility_levels
+    allowed_levels.max
   end
 end
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
deleted file mode 100644
index 62d96907c8f..00000000000
--- a/db/migrate/20160308212903_add_default_group_visibility_to_application_settings.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#Create visibility level field on DB
-#Sets default_visibility_level to value on settings if not restricted
-#If value is restricted takes higher visibility level allowed
-
-class AddDefaultGroupVisibilityToApplicationSettings < ActiveRecord::Migration
-  def up
-    add_column :application_settings, :default_group_visibility, :integer
-    execute("UPDATE application_settings SET default_group_visibility = #{allowed_visibility_level}")
-  end
-
-  def down
-    remove_column :application_settings, :default_group_visibility
-  end
-
-  private
-
-  def allowed_visibility_level
-    # TODO: Don't use `current_application_settings`
-    allowed_levels = Gitlab::VisibilityLevel.values - current_application_settings.restricted_visibility_levels
-    allowed_levels.max
-  end
-end
diff --git a/db/schema.rb b/db/schema.rb
index 11ae4815801..8537e5729a7 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -77,7 +77,6 @@ ActiveRecord::Schema.define(version: 20160320204112) do
     t.boolean  "akismet_enabled",                   default: false
     t.string   "akismet_api_key"
     t.boolean  "email_author_in_body",              default: false
-    t.integer  "default_group_visibility"
   end
 
   create_table "audit_events", force: :cascade do |t|
@@ -417,7 +416,7 @@ ActiveRecord::Schema.define(version: 20160320204112) do
     t.string   "state"
     t.integer  "iid"
     t.integer  "updated_by_id"
-    t.boolean  "confidential",              default: false
+    t.boolean  "confidential",  default: false
   end
 
   add_index "issues", ["assignee_id"], name: "index_issues_on_assignee_id", using: :btree