diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-21 14:07:46 +0300 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-21 14:07:46 +0300 |
commit | b98193c55edc94b3ecf1ff143ac85fa9e9d8f029 (patch) | |
tree | 1318c8c4d5ce2b590de7d1c3d686787a244203ac /db | |
parent | 53714ddf2bcc56659236d87647d8b8e8412592f3 (diff) | |
parent | d399e1ae2b92bc399962a286fddc59eaa09670a7 (diff) |
Merge branch 'issue_5541' into 'master'
Allow to block JIRA events for commits and merge requests
implements #5541
See merge request !7469
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20161118183841_add_commit_events_to_services.rb | 15 | ||||
-rw-r--r-- | db/schema.rb | 3 |
2 files changed, 17 insertions, 1 deletions
diff --git a/db/migrate/20161118183841_add_commit_events_to_services.rb b/db/migrate/20161118183841_add_commit_events_to_services.rb new file mode 100644 index 00000000000..4f9b5dd2281 --- /dev/null +++ b/db/migrate/20161118183841_add_commit_events_to_services.rb @@ -0,0 +1,15 @@ +class AddCommitEventsToServices < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + disable_ddl_transaction! + + def up + add_column_with_default(:services, :commit_events, :boolean, default: true, allow_null: false) + end + + def down + remove_column(:services, :commit_events) + end +end diff --git a/db/schema.rb b/db/schema.rb index db2ce689afc..6b28e80f01d 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: 20161117114805) do +ActiveRecord::Schema.define(version: 20161118183841) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -1031,6 +1031,7 @@ ActiveRecord::Schema.define(version: 20161117114805) do t.boolean "wiki_page_events", default: true t.boolean "pipeline_events", default: false, null: false t.boolean "confidential_issues_events", default: true, null: false + t.boolean "commit_events", default: true, null: false end add_index "services", ["project_id"], name: "index_services_on_project_id", using: :btree |