diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-22 21:06:42 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-22 21:06:42 +0000 |
commit | d5e0416021aa6de53b89f9d415f368226d9326e5 (patch) | |
tree | 9a3e3bd6d1aac10cfde7f0079f784a489491a48b /db | |
parent | 24fe7aa2aa199b2aace0cfec26d744f51d7e2167 (diff) | |
download | gitlab-ce-d5e0416021aa6de53b89f9d415f368226d9326e5.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20191003195218_add_pendo_enabled_to_application_settings.rb | 15 | ||||
-rw-r--r-- | db/migrate/20191003195620_add_pendo_url_to_application_settings.rb | 9 | ||||
-rw-r--r-- | db/schema.rb | 2 |
3 files changed, 26 insertions, 0 deletions
diff --git a/db/migrate/20191003195218_add_pendo_enabled_to_application_settings.rb b/db/migrate/20191003195218_add_pendo_enabled_to_application_settings.rb new file mode 100644 index 00000000000..c5f5a8cd70c --- /dev/null +++ b/db/migrate/20191003195218_add_pendo_enabled_to_application_settings.rb @@ -0,0 +1,15 @@ +class AddPendoEnabledToApplicationSettings < ActiveRecord::Migration[5.2] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + disable_ddl_transaction! + + def up + add_column_with_default :application_settings, :pendo_enabled, :boolean, default: false, allow_null: false + end + + def down + remove_column :application_settings, :pendo_enabled + end +end diff --git a/db/migrate/20191003195620_add_pendo_url_to_application_settings.rb b/db/migrate/20191003195620_add_pendo_url_to_application_settings.rb new file mode 100644 index 00000000000..cc0895f8bee --- /dev/null +++ b/db/migrate/20191003195620_add_pendo_url_to_application_settings.rb @@ -0,0 +1,9 @@ +class AddPendoUrlToApplicationSettings < ActiveRecord::Migration[5.2] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def change + add_column :application_settings, :pendo_url, :string, limit: 255 + end +end diff --git a/db/schema.rb b/db/schema.rb index aae42a475b6..1ea6f418759 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -341,6 +341,8 @@ ActiveRecord::Schema.define(version: 2019_10_17_045817) do t.integer "push_event_hooks_limit", default: 3, null: false t.integer "push_event_activities_limit", default: 3, null: false t.string "custom_http_clone_url_root", limit: 511 + t.boolean "pendo_enabled", default: false, null: false + t.string "pendo_url", limit: 255 t.index ["custom_project_templates_group_id"], name: "index_application_settings_on_custom_project_templates_group_id" t.index ["file_template_project_id"], name: "index_application_settings_on_file_template_project_id" t.index ["instance_administration_project_id"], name: "index_applicationsettings_on_instance_administration_project_id" |