summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Gliga <otzy_007@yahoo.com>2016-05-11 20:20:27 +0300
committerAndrei Gliga <otzy_007@yahoo.com>2016-05-12 13:44:46 +0300
commit9e5042e40f657c8e8145cbce95ad424ccad6e6aa (patch)
tree4d28955b9eb4cb2701defe0b5c729824d5a12205
parentc0c2cd4ed72cda88e182f3eafb472687d9d075f1 (diff)
downloadgitlab-ce-9e5042e40f657c8e8145cbce95ad424ccad6e6aa.tar.gz
Revert "disabled_oauth_sign_in_sources column" and keep on schema only the disabled_oauth_sign_in_sources column
This reverts commit 95358e0095403ad44149d11922d52e4590285a20.
-rw-r--r--db/schema.rb18
1 files changed, 9 insertions, 9 deletions
diff --git a/db/schema.rb b/db/schema.rb
index 74facd12088..b21cc162892 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -70,16 +70,16 @@ ActiveRecord::Schema.define(version: 20160508194200) do
t.string "recaptcha_site_key"
t.string "recaptcha_private_key"
t.integer "metrics_port", default: 8089
- t.boolean "akismet_enabled", default: false
- t.string "akismet_api_key"
t.integer "metrics_sample_interval", default: 15
t.boolean "sentry_enabled", default: false
t.string "sentry_dsn"
+ t.boolean "akismet_enabled", default: false
+ t.string "akismet_api_key"
t.boolean "email_author_in_body", default: false
t.integer "default_group_visibility"
t.boolean "repository_checks_enabled", default: false
- t.text "shared_runners_text"
t.integer "metrics_packet_size", default: 1
+ t.text "shared_runners_text"
t.text "disabled_oauth_sign_in_sources"
end
@@ -427,10 +427,10 @@ ActiveRecord::Schema.define(version: 20160508194200) do
t.string "state"
t.integer "iid"
t.integer "updated_by_id"
+ t.integer "moved_to_id"
t.boolean "confidential", default: false
t.datetime "deleted_at"
t.date "due_date"
- t.integer "moved_to_id"
end
add_index "issues", ["assignee_id"], name: "index_issues_on_assignee_id", using: :btree
@@ -717,8 +717,8 @@ ActiveRecord::Schema.define(version: 20160508194200) do
t.integer "project_id"
t.text "data"
t.text "encrypted_credentials"
- t.string "encrypted_credentials_iv"
- t.string "encrypted_credentials_salt"
+ t.text "encrypted_credentials_iv"
+ t.text "encrypted_credentials_salt"
end
create_table "projects", force: :cascade do |t|
@@ -816,9 +816,9 @@ ActiveRecord::Schema.define(version: 20160508194200) do
t.string "type"
t.string "title"
t.integer "project_id"
- t.datetime "created_at"
- t.datetime "updated_at"
- t.boolean "active", default: false, null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.boolean "active", null: false
t.text "properties"
t.boolean "template", default: false
t.boolean "push_events", default: true