diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2015-01-15 21:07:31 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2015-01-15 21:07:31 +0530 |
| commit | a5c3a8d3e346acce79899c04133ba6fa3c88f830 (patch) | |
| tree | ffc66bba74031dd021a86ae7e1b58fcfeff4e1ae | |
| parent | 935b73b4c132b9ef6b71054dd577cab88c0050a3 (diff) | |
| download | rails-a5c3a8d3e346acce79899c04133ba6fa3c88f830.tar.gz rails-a5c3a8d3e346acce79899c04133ba6fa3c88f830.tar.bz2 rails-a5c3a8d3e346acce79899c04133ba6fa3c88f830.zip | |
Latest gems and fix a callback bug
| -rw-r--r-- | .ruby-version | 1 | ||||
| -rw-r--r-- | Gemfile | 6 | ||||
| -rw-r--r-- | Gemfile.lock | 54 | ||||
| -rw-r--r-- | lib/action_cable/server.rb | 2 |
4 files changed, 62 insertions, 1 deletions
diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000000..cd57a8b95d --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.1.5 @@ -2,3 +2,9 @@ source 'http://rubygems.org' gemspec gem 'cramp', github: "lifo/cramp" + +group :test do + gem 'rake' + gem 'puma' +end + diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000000..1afa86ab40 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,54 @@ +GIT + remote: git://github.com/lifo/cramp.git + revision: 60f6f30fe69fedd076ac7cb64f65ba8f382c8a67 + specs: + cramp (0.15.4) + activesupport (~> 4.2.0) + eventmachine (~> 1.0.3) + faye-websocket (~> 0.9.2) + rack (~> 1.6.0) + thor (~> 0.19.0) + +PATH + remote: . + specs: + action_cable (0.0.1) + activesupport (~> 4.2.0) + cramp (~> 0.15.4) + +GEM + remote: http://rubygems.org/ + specs: + activesupport (4.2.0) + i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + eventmachine (1.0.4) + faye-websocket (0.9.2) + eventmachine (>= 0.12.0) + websocket-driver (>= 0.5.1) + i18n (0.7.0) + json (1.8.2) + minitest (5.5.1) + puma (2.10.2) + rack (>= 1.1, < 2.0) + rack (1.6.0) + rake (10.4.2) + thor (0.19.1) + thread_safe (0.3.4) + tzinfo (1.2.2) + thread_safe (~> 0.1) + websocket-driver (0.5.1) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.1) + +PLATFORMS + ruby + +DEPENDENCIES + action_cable! + cramp! + puma + rake diff --git a/lib/action_cable/server.rb b/lib/action_cable/server.rb index a55c3be3bc..4ee6b15982 100644 --- a/lib/action_cable/server.rb +++ b/lib/action_cable/server.rb @@ -11,7 +11,7 @@ module ActionCable class << self def register_channels(*channel_classes) - registered_channels.merge(channel_classes) + self.registered_channels += channel_classes end end |