From 65176b613e1d5b690af3a912ace19580cfd9e737 Mon Sep 17 00:00:00 2001 From: Nick Charlton Date: Tue, 10 Sep 2019 22:41:16 +0100 Subject: [PATCH] Drop active_job from the dependencies In #8bc80cf, we needed to add `active_job` to the dependencies to allow database seeding to continue to work. This was raised in https://github.com/rails/rails/issues/35782 and fixed in https://github.com/rails/rails/commit/d3dc651a819d95f0467b0bdad6bc85080debcc43 --- Gemfile.lock | 7 +------ administrate.gemspec | 1 - spec/example_app/config/application.rb | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f3b2ee9b54..eee4ae9aff 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,7 +4,6 @@ PATH administrate (0.11.0) actionpack (>= 4.2) actionview (>= 4.2) - activejob (>= 4.2) activerecord (>= 4.2) autoprefixer-rails (>= 6.0) datetime_picker_rails (~> 0.0.7) @@ -30,9 +29,6 @@ GEM erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.0) - activesupport (= 6.0.0) - globalid (>= 0.3.6) activemodel (6.0.0) activesupport (= 6.0.0) activerecord (6.0.0) @@ -207,9 +203,8 @@ GEM rspec-support (~> 3.8) rspec-support (3.8.0) safe_yaml (1.0.5) - sassc (2.0.1) + sassc (2.2.0) ffi (~> 1.9) - rake sassc-rails (2.1.2) railties (>= 4.0.0) sassc (>= 2.0) diff --git a/administrate.gemspec b/administrate.gemspec index fb7b3d1b22..f9fb33630c 100644 --- a/administrate.gemspec +++ b/administrate.gemspec @@ -17,7 +17,6 @@ Gem::Specification.new do |s| s.add_dependency "actionpack", ">= 4.2" s.add_dependency "actionview", ">= 4.2" s.add_dependency "activerecord", ">= 4.2" - s.add_dependency "activejob", ">= 4.2" s.add_dependency "autoprefixer-rails", ">= 6.0" s.add_dependency "datetime_picker_rails", "~> 0.0.7" diff --git a/spec/example_app/config/application.rb b/spec/example_app/config/application.rb index bb2de2694b..b3590d2456 100644 --- a/spec/example_app/config/application.rb +++ b/spec/example_app/config/application.rb @@ -4,7 +4,6 @@ require "active_record/railtie" require "action_controller/railtie" require "action_view/railtie" -require "active_job/railtie" require "sprockets/railtie" # Require the gems listed in Gemfile, including any gems