mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Use released GlobalID now that it provides URI::GID::MissingModelIdError for Active Job
This commit is contained in:
parent
80e00ac84a
commit
7a6772c0e7
3 changed files with 5 additions and 13 deletions
3
Gemfile
3
Gemfile
|
@ -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
|
||||
|
|
13
Gemfile.lock
13
Gemfile.lock
|
@ -27,14 +27,6 @@ GIT
|
|||
rack (2.0.0.alpha)
|
||||
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
|
||||
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue