diff --git a/Gemfile b/Gemfile index 3b42534da..9cd34ce21 100644 --- a/Gemfile +++ b/Gemfile @@ -124,7 +124,6 @@ group :development do gem "bundler-audit", "~> 0.7" # bundler-audit provides patch-level verification for Bundled apps gem "derailed_benchmarks", "~> 2.0", require: false # A series of things you can use to benchmark a Rails or Ruby app gem "erb_lint", github: "thepracticaldev/erb-lint", branch: "jess/remove-version-pinning", require: false # ERB Linter tool - gem "fix-db-schema-conflicts", "~> 3.0" # Ensures consistent output of db/schema.rb despite local differences in the database gem "guard", "~> 2.16", require: false # Guard is a command line tool to easily handle events on file system modifications gem "guard-livereload", "~> 2.5", require: false # Guard::LiveReload automatically reloads your browser when 'view' files are modified gem "guard-rspec", "~> 4.7", require: false # Guard::RSpec automatically run your specs diff --git a/Gemfile.lock b/Gemfile.lock index 071c7f214..2a86b8cb6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -298,8 +298,6 @@ GEM browser (>= 2.0) distribution railties (>= 5) - fix-db-schema-conflicts (3.0.3) - rubocop (>= 0.38.0) flipper (0.20.3) flipper-active_record (0.20.3) activerecord (>= 5.0, < 7) @@ -882,7 +880,6 @@ DEPENDENCIES fastly (~> 2.5) feedjira (~> 3.1) field_test (~> 0.4) - fix-db-schema-conflicts (~> 3.0) flipper (~> 0.20.3) flipper-active_record (~> 0.20.3) flipper-ui (~> 0.20.3) diff --git a/Rakefile b/Rakefile index 08cc98f38..838899e27 100644 --- a/Rakefile +++ b/Rakefile @@ -4,3 +4,6 @@ require File.expand_path("config/application", __dir__) Rails.application.load_tasks + +# Use strong_migrations to alphabetize schema columns +task "db:schema:dump": "strong_migrations:alphabetize_columns" diff --git a/vendor/cache/fix-db-schema-conflicts-3.0.3.gem b/vendor/cache/fix-db-schema-conflicts-3.0.3.gem deleted file mode 100644 index 1b360dff9..000000000 Binary files a/vendor/cache/fix-db-schema-conflicts-3.0.3.gem and /dev/null differ