diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2014-05-19 12:39:14 +0200 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2014-05-19 12:39:14 +0200 |
| commit | f3a9ad70570d52fa01d847d86f34ec2119d4631b (patch) | |
| tree | 87b237b2f698913dce4242063a35c1092d16bc30 | |
| parent | 079ff1f15c056b6a16ae143b3a49f060ee9ed60d (diff) | |
| download | rails-f3a9ad70570d52fa01d847d86f34ec2119d4631b.tar.gz rails-f3a9ad70570d52fa01d847d86f34ec2119d4631b.tar.bz2 rails-f3a9ad70570d52fa01d847d86f34ec2119d4631b.zip | |
Move activemodel-globalid dependency to gemspec
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 13 | ||||
| -rw-r--r-- | activejob.gemspec | 1 |
3 files changed, 5 insertions, 10 deletions
@@ -6,4 +6,3 @@ gem 'resque' gem 'sidekiq' gem 'sucker_punch' gem 'delayed_job' -gem 'activemodel-globalid', github: 'rails/activemodel-globalid'
\ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index e8e8e0eb18..1d86563133 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,15 +1,8 @@ -GIT - remote: git://github.com/rails/activemodel-globalid.git - revision: c9d4cfa80e9234d178617338b22728e7c08498d1 - specs: - activemodel-globalid (0.1.0) - activemodel (>= 4.1.0) - activesupport (>= 4.1.0) - PATH remote: . specs: activejob (4.2.0.alpha) + activemodel-globalid activesupport (>= 4.1.0) GEM @@ -18,6 +11,9 @@ GEM activemodel (4.1.1) activesupport (= 4.1.1) builder (~> 3.1) + activemodel-globalid (0.1.0) + activemodel (>= 4.1.0) + activesupport (>= 4.1.0) activesupport (4.1.1) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) @@ -72,7 +68,6 @@ PLATFORMS DEPENDENCIES activejob! - activemodel-globalid! delayed_job resque sidekiq diff --git a/activejob.gemspec b/activejob.gemspec index 201f3efb31..23fd25c6c8 100644 --- a/activejob.gemspec +++ b/activejob.gemspec @@ -17,4 +17,5 @@ Gem::Specification.new do |s| s.require_path = 'lib' s.add_dependency 'activesupport', '>= 4.1.0' + s.add_dependency 'activemodel-globalid' end |