Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-06-02 19:30:58 +0300
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-06-02 19:30:58 +0300
commitb2d577a7a293ac6c82a8bc64f5b134558460df5b (patch)
treefaefbf876aa9a9de692ae8c63cbf8c8c90907951 /db
parent5a4a08249055022e9e6e30d9ab38c45c1bf71842 (diff)
Fix up merge issues
Diffstat (limited to 'db')
-rw-r--r--db/schema.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/db/schema.rb b/db/schema.rb
index fa1c5dc15c4..368b8e99c78 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1446,8 +1446,8 @@ ActiveRecord::Schema.define(version: 20170525174156) do
t.string "token"
t.boolean "pipeline_events", default: false, null: false
t.boolean "confidential_issues_events", default: false, null: false
- t.boolean "job_events", default: false, null: false
t.boolean "repository_update_events", default: false, null: false
+ t.boolean "job_events", default: false, null: false
end
add_index "web_hooks", ["project_id"], name: "index_web_hooks_on_project_id", using: :btree