diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2015-07-05 14:50:33 +0200 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2015-07-05 14:50:33 +0200 |
| commit | 5294bf1ef615662bd2fd7c7385022f0b3de7d26a (patch) | |
| tree | d98b8a631a664bf640125b1e4fcc82539855a381 | |
| parent | ba400c7e88329ee70fd62bcd060389abb7dcebb2 (diff) | |
| download | rails-5294bf1ef615662bd2fd7c7385022f0b3de7d26a.tar.gz rails-5294bf1ef615662bd2fd7c7385022f0b3de7d26a.tar.bz2 rails-5294bf1ef615662bd2fd7c7385022f0b3de7d26a.zip | |
Add gemfile entry for GlobalID until a new release is cut.
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 12 |
2 files changed, 12 insertions, 3 deletions
@@ -5,6 +5,9 @@ gemspec # We need a newish Rake since Active Job sets its test tasks' descriptions. gem 'rake', '>= 10.3' +# Active Job depends on the URI::GID::MissingModelIDError, which isn't released yet. +gem 'globalid', github: 'rails/globalid' + # This needs to be with require false as it is # loaded after loading the test library to # ensure correct loading order diff --git a/Gemfile.lock b/Gemfile.lock index 2140881170..960a77af92 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -26,6 +26,13 @@ GIT arel (7.0.0.alpha) GIT + remote: git://github.com/rails/globalid.git + revision: 4df66fb9e9f0c832d29119aa8bc30be55a614b71 + specs: + globalid (0.3.5) + activesupport (>= 4.1.0) + +GIT remote: git://github.com/rails/jquery-rails.git revision: 272abdd319bb3381b23182b928b25320590096b0 branch: master @@ -138,8 +145,6 @@ GEM delayed_job (>= 3.0, < 4.1) erubis (2.7.0) execjs (2.3.0) - globalid (0.3.3) - activesupport (>= 4.1.0) hitimes (1.2.2) hitimes (1.2.2-x86-mingw32) i18n (0.7.0) @@ -272,6 +277,7 @@ DEPENDENCIES dalli (>= 2.2.1) delayed_job delayed_job_active_record + globalid! jquery-rails! json kindlerb (= 0.1.1) @@ -308,4 +314,4 @@ DEPENDENCIES w3c_validators BUNDLED WITH - 1.10.4 + 1.10.5 |