Skip to content

Commit

Permalink
Update for 5.0.0.beta2
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewd committed Feb 3, 2016
1 parent 2d87837 commit 37bf0ac
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 87 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
source 'https://rubygems.org'

gem 'rails', github: "rails/rails"
gem 'rails', '5.0.0.beta2'
gem 'sprockets-rails', github: "rails/sprockets-rails"
gem 'arel', github: "rails/arel"

gem 'sqlite3'
gem 'redis'
gem 'puma'

gem 'sass-rails', '~> 5.0'
Expand Down
146 changes: 63 additions & 83 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
GIT
remote: git://github.com/rails/arel.git
revision: 63ea665c8083f8069a0d05d4f15cf19e08e470a6
specs:
arel (7.0.0)

GIT
remote: git://github.com/rails/coffee-rails.git
revision: 29604a59a5d7ea314f54bb52302d68ef134806bf
Expand All @@ -12,71 +6,6 @@ GIT
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.1.x)

GIT
remote: git://github.com/rails/rails.git
revision: 5d1b7c3b441654e8008dcd303f5367883ec660a6
specs:
actioncable (5.0.0.beta1)
actionpack (= 5.0.0.beta1)
coffee-rails (~> 4.1.0)
em-hiredis (~> 0.3.0)
faye-websocket (~> 0.10.0)
redis (~> 3.0)
websocket-driver (~> 0.6.1)
actionmailer (5.0.0.beta1)
actionpack (= 5.0.0.beta1)
actionview (= 5.0.0.beta1)
activejob (= 5.0.0.beta1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (5.0.0.beta1)
actionview (= 5.0.0.beta1)
activesupport (= 5.0.0.beta1)
rack (~> 2.x)
rack-test (~> 0.6.3)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.0.0.beta1)
activesupport (= 5.0.0.beta1)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (5.0.0.beta1)
activesupport (= 5.0.0.beta1)
globalid (>= 0.3.6)
activemodel (5.0.0.beta1)
activesupport (= 5.0.0.beta1)
activerecord (5.0.0.beta1)
activemodel (= 5.0.0.beta1)
activesupport (= 5.0.0.beta1)
arel (~> 7.0)
activesupport (5.0.0.beta1)
concurrent-ruby (~> 1.0)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
method_source
minitest (~> 5.1)
tzinfo (~> 1.1)
rails (5.0.0.beta1)
actioncable (= 5.0.0.beta1)
actionmailer (= 5.0.0.beta1)
actionpack (= 5.0.0.beta1)
actionview (= 5.0.0.beta1)
activejob (= 5.0.0.beta1)
activemodel (= 5.0.0.beta1)
activerecord (= 5.0.0.beta1)
activesupport (= 5.0.0.beta1)
bundler (>= 1.3.0, < 2.0)
railties (= 5.0.0.beta1)
sprockets-rails (>= 2.0.0)
railties (5.0.0.beta1)
actionpack (= 5.0.0.beta1)
activesupport (= 5.0.0.beta1)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)

GIT
remote: git://github.com/rails/sprockets-rails.git
revision: 9ef1ac55b5c22a77bec2552f175bd02f574084a0
Expand Down Expand Up @@ -105,6 +34,46 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actioncable (5.0.0.beta2)
actionpack (= 5.0.0.beta2)
nio4r (~> 1.2)
websocket-driver (~> 0.6.1)
actionmailer (5.0.0.beta2)
actionpack (= 5.0.0.beta2)
actionview (= 5.0.0.beta2)
activejob (= 5.0.0.beta2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (5.0.0.beta2)
actionview (= 5.0.0.beta2)
activesupport (= 5.0.0.beta2)
rack (~> 2.x)
rack-test (~> 0.6.3)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.0.0.beta2)
activesupport (= 5.0.0.beta2)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (5.0.0.beta2)
activesupport (= 5.0.0.beta2)
globalid (>= 0.3.6)
activemodel (5.0.0.beta2)
activesupport (= 5.0.0.beta2)
activerecord (5.0.0.beta2)
activemodel (= 5.0.0.beta2)
activesupport (= 5.0.0.beta2)
arel (~> 7.0)
activesupport (5.0.0.beta2)
concurrent-ruby (~> 1.0)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
method_source
minitest (~> 5.1)
tzinfo (~> 1.1)
arel (7.0.0)
builder (3.2.2)
byebug (8.2.1)
coffee-script (2.4.1)
Expand All @@ -113,18 +82,10 @@ GEM
coffee-script-source (1.10.0)
concurrent-ruby (1.0.0)
debug_inspector (0.0.2)
em-hiredis (0.3.0)
eventmachine (~> 1.0)
hiredis (~> 0.5.0)
erubis (2.7.0)
eventmachine (1.0.9.1)
execjs (2.6.0)
faye-websocket (0.10.2)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
globalid (0.3.6)
activesupport (>= 4.1.0)
hiredis (0.5.2)
i18n (0.7.0)
jbuilder (2.4.0)
activesupport (>= 3.0.0, < 5.1)
Expand All @@ -141,23 +102,42 @@ GEM
method_source (0.8.2)
mime-types (2.99)
mini_portile2 (2.0.0)
minitest (5.8.3)
minitest (5.8.4)
multi_json (1.11.2)
nio4r (1.2.1)
nokogiri (1.6.7.1)
mini_portile2 (~> 2.0.0.rc2)
puma (2.15.3)
rack (2.0.0.alpha)
json
rack-test (0.6.3)
rack (>= 1.0)
rails (5.0.0.beta2)
actioncable (= 5.0.0.beta2)
actionmailer (= 5.0.0.beta2)
actionpack (= 5.0.0.beta2)
actionview (= 5.0.0.beta2)
activejob (= 5.0.0.beta2)
activemodel (= 5.0.0.beta2)
activerecord (= 5.0.0.beta2)
activesupport (= 5.0.0.beta2)
bundler (>= 1.3.0, < 2.0)
railties (= 5.0.0.beta2)
sprockets-rails (>= 2.0.0)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.2)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
railties (5.0.0.beta2)
actionpack (= 5.0.0.beta2)
activesupport (= 5.0.0.beta2)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.5.0)
redis (3.2.2)
sass (3.4.21)
Expand Down Expand Up @@ -188,13 +168,13 @@ PLATFORMS
ruby

DEPENDENCIES
arel!
byebug
coffee-rails!
jbuilder (~> 2.0)
jquery-rails
puma
rails!
rails (= 5.0.0.beta2)
redis
sass-rails (~> 5.0)
spring
sprockets-rails!
Expand Down
2 changes: 0 additions & 2 deletions cable/config.ru
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
require ::File.expand_path('../../config/environment', __FILE__)
Rails.application.eager_load!

require 'action_cable/process/logging'

run ActionCable.server
File renamed without changes.

0 comments on commit 37bf0ac

Please sign in to comment.