summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-05-04 11:28:12 +0100
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-05-04 11:28:12 +0100
commit1a8dc206a49a3812ce920ad94deda1ef57929c1b (patch)
treec2f24a8439960da93845e573c68dbcd9af825205 /db
parentd34f6764146add6a9fc928f3a87b902c02b43742 (diff)
downloadgitlab-ce-1a8dc206a49a3812ce920ad94deda1ef57929c1b.tar.gz
Reset migration to head
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20170428123910_add_clientside_sentry_to_application_settings.rb31
-rw-r--r--db/migrate/20170504094058_add_clientside_sentry_to_application_settings.rb65
-rw-r--r--db/schema.rb2
3 files changed, 0 insertions, 98 deletions
diff --git a/db/migrate/20170428123910_add_clientside_sentry_to_application_settings.rb b/db/migrate/20170428123910_add_clientside_sentry_to_application_settings.rb
deleted file mode 100644
index f3e08aed819..00000000000
--- a/db/migrate/20170428123910_add_clientside_sentry_to_application_settings.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-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 the methods "add_concurrent_index" or "add_column_with_default"
- # you must disable the use of transactions as these methods can not run in an
- # existing transaction. When using "add_concurrent_index" make sure that this
- # method 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 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/migrate/20170504094058_add_clientside_sentry_to_application_settings.rb b/db/migrate/20170504094058_add_clientside_sentry_to_application_settings.rb
deleted file mode 100644
index 9462d858334..00000000000
--- a/db/migrate/20170504094058_add_clientside_sentry_to_application_settings.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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 the methods "add_concurrent_index", "remove_concurrent_index" or
- # "add_column_with_default" you must disable the use of transactions
- # as these methods can not run in an existing transaction.
- # 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!
-
- # Reversability was tested when I made an update the originally irreversible
- # migration after I ran it, so I could test that the down method worked and then
- # the up method worked.
-
- 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
-
-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 the methods "add_concurrent_index" or "add_column_with_default"
- # you must disable the use of transactions as these methods can not run in an
- # existing transaction. When using "add_concurrent_index" make sure that this
- # method 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 fails and can be retried or reverted easily.
- #
- # To disable transactions uncomment the following line and remove these
- # comments:
- disable_ddl_transaction!
-
-
-end
diff --git a/db/schema.rb b/db/schema.rb
index 519a444833b..01c0f00c924 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -121,8 +121,6 @@ ActiveRecord::Schema.define(version: 20170502091007) 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|