diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2016-01-16 15:42:20 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2016-01-16 15:42:20 +0100 |
| commit | 01c320001bcce617196270f3d398d48a89a6ea2a (patch) | |
| tree | 18ca55a61b9bd0bd73bcad2f8f0dbc61dfc79f69 /Gemfile.lock | |
| parent | f5065ef60c011a0d84224e74e1e8a0b882c36223 (diff) | |
| download | rails-01c320001bcce617196270f3d398d48a89a6ea2a.tar.gz rails-01c320001bcce617196270f3d398d48a89a6ea2a.tar.bz2 rails-01c320001bcce617196270f3d398d48a89a6ea2a.zip | |
Revert "Merge pull request #22977 from rails/revert-22934-master"
This reverts commit d0393fccffc118a5de37654aa222774b66123393, reversing
changes made to 3b7ccadfc1c8dfec61af898167e1300b17f5cf25.
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e56ad217d6..4f17b7a81a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -31,8 +31,8 @@ PATH specs: actioncable (5.0.0.beta1) actionpack (= 5.0.0.beta1) - celluloid (~> 0.17.2) coffee-rails (~> 4.1.0) + concurrent-ruby (~> 1.0.0) em-hiredis (~> 0.3.0) faye-websocket (~> 0.10.0) redis (~> 3.0) |