diff --git a/db/schema.rb b/db/schema.rb index 124023545f9..32e49ff7a74 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -18,7 +18,6 @@ ActiveRecord::Schema.define(version: 20150125163100) do create_table "application_settings", force: true do |t| t.integer "default_projects_limit" - t.integer "default_branch_protection" t.boolean "signup_enabled" t.boolean "signin_enabled" t.boolean "gravatar_enabled" @@ -26,6 +25,7 @@ ActiveRecord::Schema.define(version: 20150125163100) do t.datetime "created_at" t.datetime "updated_at" t.string "home_page_url" + t.integer "default_branch_protection", default: 2 end create_table "broadcast_messages", force: true do |t| @@ -323,12 +323,12 @@ ActiveRecord::Schema.define(version: 20150125163100) do t.string "import_url" t.integer "visibility_level", default: 0, null: false t.boolean "archived", default: false, null: false + t.string "avatar" t.string "import_status" t.float "repository_size", default: 0.0 t.integer "star_count", default: 0, null: false t.string "import_type" t.string "import_source" - t.string "avatar" end add_index "projects", ["creator_id"], name: "index_projects_on_creator_id", using: :btree @@ -426,6 +426,7 @@ ActiveRecord::Schema.define(version: 20150125163100) do t.integer "notification_level", default: 1, null: false t.datetime "password_expires_at" t.integer "created_by_id" + t.datetime "last_credential_check_at" t.string "avatar" t.string "confirmation_token" t.datetime "confirmed_at" @@ -433,7 +434,6 @@ ActiveRecord::Schema.define(version: 20150125163100) do t.string "unconfirmed_email" t.boolean "hide_no_ssh_key", default: false t.string "website_url", default: "", null: false - t.datetime "last_credential_check_at" t.string "github_access_token" end diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 75afc024a62..90f0d648f98 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -12,7 +12,7 @@ module Gitlab def fake_application_settings OpenStruct.new( default_projects_limit: Settings.gitlab['default_projects_limit'], - default_branch_protection: Settings.gitlab['default_branch_protection'], + default_branch_protection: Settings.gitlab['default_branch_protection'], signup_enabled: Settings.gitlab['signup_enabled'], signin_enabled: Settings.gitlab['signin_enabled'], gravatar_enabled: Settings.gravatar['enabled'],