diff options
| author | James Lopez <james@jameslopez.es> | 2016-03-21 18:41:16 +0100 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-03-21 18:41:16 +0100 |
| commit | e937f312cdaa4b98f6f043c6a6baa1be03868bf0 (patch) | |
| tree | a31c5e3c0fc13d2cdb893e304ce8d0f466ea4c97 /db/schema.rb | |
| parent | 868e4918f93021430162ec097d3362f313a4bb80 (diff) | |
| parent | 2bcbc7c6db934d56448c4c261861e62982b9b573 (diff) | |
| download | gitlab-ce-e937f312cdaa4b98f6f043c6a6baa1be03868bf0.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-import_url
# Conflicts:
# db/schema.rb
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/db/schema.rb b/db/schema.rb index 71f1e1e496e..a70b2ed1f63 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20160316204731) do +ActiveRecord::Schema.define(version: 20160317092222) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -416,7 +416,8 @@ ActiveRecord::Schema.define(version: 20160316204731) do t.string "state" t.integer "iid" t.integer "updated_by_id" - t.boolean "confidential", default: false + t.integer "moved_to_id" + t.boolean "confidential", default: false end add_index "issues", ["assignee_id"], name: "index_issues_on_assignee_id", using: :btree |