summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2016-03-09 12:53:55 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2016-03-09 12:53:55 +0000
commit2af9326c3433c7aebbcc3473859bfbccc47b5e17 (patch)
tree004468d7d57a810455a9ab78744257fef1498e7f
parent0ab52373c37feef465c413c969b74f57eec158ba (diff)
parentc666441d405c1275ef7bcc791153f09d819cc89d (diff)
downloadgitlab-ce-2af9326c3433c7aebbcc3473859bfbccc47b5e17.tar.gz
Merge branch 'update-db-schema' into 'master'
See merge request !3136
-rw-r--r--db/schema.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/db/schema.rb b/db/schema.rb
index 2d6b9b5a4cc..4f56f3970db 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -697,6 +697,7 @@ ActiveRecord::Schema.define(version: 20160305220806) do
t.integer "build_timeout", default: 3600, null: false
t.boolean "pending_delete", default: false
t.boolean "public_builds", default: true, null: false
+ t.string "main_language"
end
add_index "projects", ["builds_enabled", "shared_runners_enabled"], name: "index_projects_on_builds_enabled_and_shared_runners_enabled", using: :btree