summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-01-20 20:04:15 +0100
committerDouwe Maan <douwe@selenight.nl>2016-01-20 20:04:15 +0100
commit7d347ae564c137bd8b133dd4d589b089bde931a5 (patch)
tree2004517d9c80fbd95359d2bd53842fa031415a72 /db
parent6000f8545f43b449035cb50382901ce40fb807b0 (diff)
parenta8a65afe1e953ce3a9fc151f9e033b99fc568fad (diff)
downloadgitlab-ce-7d347ae564c137bd8b133dd4d589b089bde931a5.tar.gz
Merge branch 'master' into issue_3945
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20160118155830_add_sentry_to_application_settings.rb8
-rw-r--r--db/schema.rb2
2 files changed, 10 insertions, 0 deletions
diff --git a/db/migrate/20160118155830_add_sentry_to_application_settings.rb b/db/migrate/20160118155830_add_sentry_to_application_settings.rb
new file mode 100644
index 00000000000..fa7ff9d9228
--- /dev/null
+++ b/db/migrate/20160118155830_add_sentry_to_application_settings.rb
@@ -0,0 +1,8 @@
+class AddSentryToApplicationSettings < ActiveRecord::Migration
+ def change
+ change_table :application_settings do |t|
+ t.boolean :sentry_enabled, default: false
+ t.string :sentry_dsn
+ end
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 7eb99a47c71..a7cadacc0ce 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -62,6 +62,8 @@ ActiveRecord::Schema.define(version: 20160120172143) do
t.string "recaptcha_private_key"
t.integer "metrics_port", default: 8089
t.integer "metrics_sample_interval", default: 15
+ t.boolean "sentry_enabled", default: false
+ t.string "sentry_dsn"
end
create_table "audit_events", force: :cascade do |t|