diff options
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 13 | ||||
| -rw-r--r-- | activejob/activejob.gemspec | 2 |
3 files changed, 5 insertions, 13 deletions
@@ -5,8 +5,7 @@ gemspec # We need a newish Rake since Active Job sets its test tasks' descriptions. gem 'rake', '>= 10.3' -# Active Job depends on URI::GID::MissingModelIDError, which isn't released yet. -gem 'globalid', github: 'rails/globalid', branch: 'master' +# We need unreleased Rack 2.0.0.alpha gem 'rack', github: 'rack/rack', branch: 'master' # This needs to be with require false to ensure correct loading order, as has to diff --git a/Gemfile.lock b/Gemfile.lock index 1006143f54..8db1122a09 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,14 +28,6 @@ GIT json GIT - remote: git://github.com/rails/globalid.git - revision: 4e74ec6bb60d735ef3c56080f9c9f1dee9cadaaf - branch: master - specs: - globalid (0.3.6) - activesupport (>= 4.1.0) - -GIT remote: git://github.com/sass/sass.git revision: bce9509f396225d721501ea1070a6871b708abb1 branch: stable @@ -74,7 +66,7 @@ PATH rails-html-sanitizer (~> 1.0, >= 1.0.2) activejob (5.0.0.alpha) activesupport (= 5.0.0.alpha) - globalid (>= 0.3.0) + globalid (>= 0.3.6) activemodel (5.0.0.alpha) activesupport (= 5.0.0.alpha) builder (~> 3.1) @@ -170,6 +162,8 @@ GEM ffi (1.9.10) ffi (1.9.10-x64-mingw32) ffi (1.9.10-x86-mingw32) + globalid (0.3.6) + activesupport (>= 4.1.0) hiredis (0.5.2) hitimes (1.2.3) hitimes (1.2.3-x86-mingw32) @@ -319,7 +313,6 @@ DEPENDENCIES dalli (>= 2.2.1) delayed_job delayed_job_active_record - globalid! json kindlerb (= 0.1.1) listen (~> 3.0.5) diff --git a/activejob/activejob.gemspec b/activejob/activejob.gemspec index 24e38e495f..bc1671b508 100644 --- a/activejob/activejob.gemspec +++ b/activejob/activejob.gemspec @@ -19,5 +19,5 @@ Gem::Specification.new do |s| s.require_path = 'lib' s.add_dependency 'activesupport', version - s.add_dependency 'globalid', '>= 0.3.0' + s.add_dependency 'globalid', '>= 0.3.6' end |