aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-07-09 00:29:43 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-07-09 00:29:43 -0300
commita55ed7f93e95770036381bd7ff9b29860bee7c80 (patch)
tree2db6c2bbe85606d7b0a44307263d8e37e79bb306
parent244c6bf7a4b1144234464761121d317d5acb15ec (diff)
parent42ac768562a981cbede1d8c4119eb5304a62dd83 (diff)
downloadrails-a55ed7f93e95770036381bd7ff9b29860bee7c80.tar.gz
rails-a55ed7f93e95770036381bd7ff9b29860bee7c80.tar.bz2
rails-a55ed7f93e95770036381bd7ff9b29860bee7c80.zip
Merge pull request #9 from packagethief/freshen-gemfile-lock
Freshen Gemfile.lock
-rw-r--r--Gemfile.lock7
1 files changed, 4 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 4e2ff79c81..578fc63b02 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,17 +1,18 @@
PATH
remote: .
specs:
- action_cable (0.1.0)
+ actioncable (0.1.0)
activesupport (>= 4.2.0)
celluloid (~> 0.16.0)
em-hiredis (~> 0.3.0)
faye-websocket (~> 0.9.2)
redis (~> 3.0)
+ websocket-driver (= 0.5.4)
GEM
remote: http://rubygems.org/
specs:
- activesupport (4.2.2)
+ activesupport (4.2.3)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
@@ -49,7 +50,7 @@ PLATFORMS
ruby
DEPENDENCIES
- action_cable!
+ actioncable!
puma
rake