summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <gitlab.shinyamaeda@gmail.com>2017-04-05 02:31:15 +0900
committerShinya Maeda <gitlab.shinyamaeda@gmail.com>2017-04-06 23:46:59 +0900
commit7b09a484f1ecc422ce14602d9ee15e5a59100264 (patch)
treeae7bdf46346a7d1b81d7dfffea52fe450f7aaf24
parent31bd3962d7e37f6143721ab0d09d94daf9dd0481 (diff)
downloadgitlab-ce-7b09a484f1ecc422ce14602d9ee15e5a59100264.tar.gz
Fix unnecessary changes in schema.rb
-rw-r--r--db/schema.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/db/schema.rb b/db/schema.rb
index a564a4b6a12..58425d637c1 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -61,6 +61,7 @@ ActiveRecord::Schema.define(version: 20170405080720) do
t.boolean "shared_runners_enabled", default: true, null: false
t.integer "max_artifacts_size", default: 100, null: false
t.string "runners_registration_token"
+ t.integer "max_pages_size", default: 100, null: false
t.boolean "require_two_factor_authentication", default: false
t.integer "two_factor_grace_period", default: 48
t.boolean "metrics_enabled", default: false
@@ -110,7 +111,6 @@ ActiveRecord::Schema.define(version: 20170405080720) do
t.string "plantuml_url"
t.boolean "plantuml_enabled"
t.integer "terminal_max_session_time", default: 0, null: false
- t.integer "max_pages_size", default: 100, null: false
t.string "default_artifacts_expire_in", default: "0", null: false
t.integer "unique_ips_limit_per_user"
t.integer "unique_ips_limit_time_window"
@@ -704,8 +704,8 @@ ActiveRecord::Schema.define(version: 20170405080720) do
t.integer "visibility_level", default: 20, null: false
t.boolean "request_access_enabled", default: false, null: false
t.datetime "deleted_at"
- t.boolean "lfs_enabled"
t.text "description_html"
+ t.boolean "lfs_enabled"
t.integer "parent_id"
end
@@ -1257,8 +1257,8 @@ ActiveRecord::Schema.define(version: 20170405080720) do
t.datetime "otp_grace_period_started_at"
t.boolean "ldap_email", default: false, null: false
t.boolean "external", default: false
- t.string "organization"
t.string "incoming_email_token"
+ t.string "organization"
t.boolean "authorized_projects_populated"
t.boolean "ghost"
t.boolean "notified_of_own_activity"