diff options
| author | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-04-06 23:35:01 +0300 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-04-06 23:35:01 +0300 |
| commit | 55811ac9900af81fb980c3649ee1c9aadedb3a44 (patch) | |
| tree | 437628918788ef02c879f59e64d109c1283fde27 /db/schema.rb | |
| parent | 902054db59e02cb14c28ecffd9dff95994dbb01f (diff) | |
| parent | c3af43c3d263278bd39917c37a87022f8dc44e95 (diff) | |
Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tags
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/db/schema.rb b/db/schema.rb index d998b8f6474..e50a51ce673 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: 20170402231018) do +ActiveRecord::Schema.define(version: 20170405080720) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -920,6 +920,7 @@ ActiveRecord::Schema.define(version: 20170402231018) do t.text "description_html" t.boolean "only_allow_merge_if_all_discussions_are_resolved" t.boolean "printing_merge_request_link_enabled", default: true, null: false + t.string "import_jid" end add_index "projects", ["ci_id"], name: "index_projects_on_ci_id", using: :btree |