diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-09-15 13:19:53 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-09-15 13:19:53 +0200 |
| commit | 50076ab974348e74514bb4f19169351f08e11636 (patch) | |
| tree | f3ba725e2170e58513995fe941fef30ac13afb45 /db/schema.rb | |
| parent | 11f87700e8bceeec96440809682406ae24334ed8 (diff) | |
| parent | 4768521a6e9d6d8b9a57398ebb5d03aed5b5ac77 (diff) | |
| download | gitlab-ce-50076ab974348e74514bb4f19169351f08e11636.tar.gz | |
Merge remote-tracking branch 'origin/master' into per-build-token
# Conflicts:
# db/schema.rb
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/db/schema.rb b/db/schema.rb index bf913e278fe..af00094c6b6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,8 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20160907131111) do + +ActiveRecord::Schema.define(version: 20160913162434) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -826,7 +827,6 @@ ActiveRecord::Schema.define(version: 20160907131111) do t.integer "build_timeout", default: 3600, null: false t.boolean "pending_delete", default: false t.boolean "public_builds", default: true, null: false - t.integer "pushes_since_gc", default: 0 t.boolean "last_repository_check_failed" t.datetime "last_repository_check_at" t.boolean "container_registry_enabled" |