summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-05-05 17:51:38 +0000
committerPhil Hughes <me@iamphill.com>2017-05-05 17:51:38 +0000
commitb81535351023a3b19870ce052d8c3d0563391686 (patch)
tree0332d42df3b6fb80e752b47121f6a0f4ddb0cf92 /db
parentc9b246334753c47bef1111bdbfc1a45a1c9b0cfe (diff)
parente5a7ed3ac36aaa1045353e589dae98a29ca72f1e (diff)
downloadgitlab-ce-b81535351023a3b19870ce052d8c3d0563391686.tar.gz
Merge branch 'add-sentry-js-again-with-vue' into 'master'
Add sentry JS See merge request !6764
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20170504102911_add_clientside_sentry_to_application_settings.rb33
-rw-r--r--db/schema.rb6
2 files changed, 37 insertions, 2 deletions
diff --git a/db/migrate/20170504102911_add_clientside_sentry_to_application_settings.rb b/db/migrate/20170504102911_add_clientside_sentry_to_application_settings.rb
new file mode 100644
index 00000000000..141112f8b50
--- /dev/null
+++ b/db/migrate/20170504102911_add_clientside_sentry_to_application_settings.rb
@@ -0,0 +1,33 @@
+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class AddClientsideSentryToApplicationSettings < ActiveRecord::Migration
+ include Gitlab::Database::MigrationHelpers
+
+ # Set this constant to true if this migration requires downtime.
+ DOWNTIME = false
+
+ # When a migration requires downtime you **must** uncomment the following
+ # constant and define a short and easy to understand explanation as to why the
+ # migration requires downtime.
+ # DOWNTIME_REASON = ''
+
+ # When using "add_concurrent_index" or "remove_concurrent_index" methods make sure
+ # that either of them is the _only_ method called in the migration,
+ # any other changes should go in a separate migration.
+ # This ensures that upon failure _only_ the index creation or removing fails
+ # and can be retried or reverted easily.
+ #
+ # To disable transactions uncomment the following line and remove these
+ # comments:
+ disable_ddl_transaction!
+
+ def up
+ add_column_with_default :application_settings, :clientside_sentry_enabled, :boolean, default: false
+ add_column :application_settings, :clientside_sentry_dsn, :string
+ end
+
+ def down
+ remove_columns :application_settings, :clientside_sentry_enabled, :clientside_sentry_dsn
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 132549ab34c..588e2082ae0 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: 20170503004425) do
+ActiveRecord::Schema.define(version: 20170504102911) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -121,6 +121,8 @@ ActiveRecord::Schema.define(version: 20170503004425) do
t.integer "cached_markdown_version"
t.boolean "usage_ping_enabled", default: true, null: false
t.string "uuid"
+ t.boolean "clientside_sentry_enabled", default: false, null: false
+ t.string "clientside_sentry_dsn"
end
create_table "audit_events", force: :cascade do |t|
@@ -1413,4 +1415,4 @@ ActiveRecord::Schema.define(version: 20170503004425) do
add_foreign_key "timelogs", "merge_requests", name: "fk_timelogs_merge_requests_merge_request_id", on_delete: :cascade
add_foreign_key "trending_projects", "projects", on_delete: :cascade
add_foreign_key "u2f_registrations", "users"
-end
+end \ No newline at end of file