diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-08-27 03:53:31 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-08-27 03:53:31 +0300 |
commit | 843694f90270e290f164bed68362500c9e331a46 (patch) | |
tree | 0e20cc09df536365db817ba8aef4c77d3d0c684e /db | |
parent | 6afd69f4445cc0688aa1695389eb3f79033e3121 (diff) | |
parent | de3b7d9c522db8d129a64f2b86297cf90413cb1e (diff) |
Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20150824002011_add_enable_ssl_verification.rb | 5 | ||||
-rw-r--r-- | db/schema.rb | 14 |
2 files changed, 12 insertions, 7 deletions
diff --git a/db/migrate/20150824002011_add_enable_ssl_verification.rb b/db/migrate/20150824002011_add_enable_ssl_verification.rb new file mode 100644 index 00000000000..093c068fbde --- /dev/null +++ b/db/migrate/20150824002011_add_enable_ssl_verification.rb @@ -0,0 +1,5 @@ +class AddEnableSslVerification < ActiveRecord::Migration + def change + add_column :web_hooks, :enable_ssl_verification, :boolean, default: false + end +end diff --git a/db/schema.rb b/db/schema.rb index 585531c1ee6..77ced9caa3c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -821,14 +821,14 @@ ActiveRecord::Schema.define(version: 20150826001931) do t.integer "project_id" t.datetime "created_at" t.datetime "updated_at" - t.string "type", default: "ProjectHook" + t.string "type", default: "ProjectHook" t.integer "service_id" - t.boolean "push_events", default: true, null: false - t.boolean "issues_events", default: false, null: false - t.boolean "merge_requests_events", default: false, null: false - t.boolean "tag_push_events", default: false - t.integer "group_id" - t.boolean "note_events", default: false, null: false + t.boolean "push_events", default: true, null: false + t.boolean "issues_events", default: false, null: false + t.boolean "merge_requests_events", default: false, null: false + t.boolean "tag_push_events", default: false + t.boolean "note_events", default: false, null: false + t.boolean "enable_ssl_verification", default: false end add_index "web_hooks", ["created_at", "id"], name: "index_web_hooks_on_created_at_and_id", using: :btree |