Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP Update to React On Rails v6 #287

Merged
merged 1 commit into from
May 20, 2016
Merged

WIP Update to React On Rails v6 #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ruby-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.3.0
2.3.1
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

UPGRADE NOTE: this is not required, but was recommended by the Ruby install.

2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language:
- ruby
rvm:
- 2.3.0
- 2.3.1
sudo: false
addons:
apt:
Expand Down
6 changes: 3 additions & 3 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
source "https://rubygems.org"
ruby "2.3.0"
ruby "2.3.1"

#
# Bundle edge Rails instead: gem "rails", github: "rails/rails"
gem "rails", "5.0.0.beta3"
gem "rails", "5.0.0.rc1"
gem "listen"

# Note: We're using sqllite3 for development and testing
Expand Down Expand Up @@ -41,7 +41,7 @@ gem "sdoc", group: :doc
# Use Rails Html Sanitizer for HTML sanitization
gem "rails-html-sanitizer"

gem "react_on_rails", "~> 5.1.1"
gem "react_on_rails", "6.0.0.rc.5"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

UPGRADE NOTE: This is the relevant gem change. Adjust to the latest version of React on Rails.


# See https://github.com/sstephenson/execjs#readme for more supported runtimes
gem "therubyracer"
Expand Down
146 changes: 64 additions & 82 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.0.0.beta3)
actionpack (= 5.0.0.beta3)
actioncable (5.0.0.rc1)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

UPGRADE NOTE: Do not worry about these changes. Your Gemfile.lock will update when you run bundle.

actionpack (= 5.0.0.rc1)
nio4r (~> 1.2)
websocket-driver (~> 0.6.1)
actionmailer (5.0.0.beta3)
actionpack (= 5.0.0.beta3)
actionview (= 5.0.0.beta3)
activejob (= 5.0.0.beta3)
actionmailer (5.0.0.rc1)
actionpack (= 5.0.0.rc1)
actionview (= 5.0.0.rc1)
activejob (= 5.0.0.rc1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (5.0.0.beta3)
actionview (= 5.0.0.beta3)
activesupport (= 5.0.0.beta3)
actionpack (5.0.0.rc1)
actionview (= 5.0.0.rc1)
activesupport (= 5.0.0.rc1)
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.beta3)
activesupport (= 5.0.0.beta3)
actionview (5.0.0.rc1)
activesupport (= 5.0.0.rc1)
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.beta3)
activesupport (= 5.0.0.beta3)
activejob (5.0.0.rc1)
activesupport (= 5.0.0.rc1)
globalid (>= 0.3.6)
activemodel (5.0.0.beta3)
activesupport (= 5.0.0.beta3)
activerecord (5.0.0.beta3)
activemodel (= 5.0.0.beta3)
activesupport (= 5.0.0.beta3)
activemodel (5.0.0.rc1)
activesupport (= 5.0.0.rc1)
activerecord (5.0.0.rc1)
activemodel (= 5.0.0.rc1)
activesupport (= 5.0.0.rc1)
arel (~> 7.0)
activesupport (5.0.0.beta3)
concurrent-ruby (~> 1.0)
activesupport (5.0.0.rc1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
minitest (~> 5.1)
tzinfo (~> 1.1)
Expand All @@ -48,22 +48,13 @@ GEM
awesome_print (1.6.1)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
brakeman (3.2.1)
erubis (~> 2.6)
haml (>= 3.0, < 5.0)
highline (>= 1.6.20, < 2.0)
ruby2ruby (~> 2.3.0)
ruby_parser (~> 3.8.1)
safe_yaml (>= 1.0)
sass (~> 3.0)
slim (>= 1.3.6, < 4.0)
terminal-table (~> 1.4)
brakeman (3.3.0)
builder (3.2.2)
bundler-audit (0.5.0)
bundler (~> 1.2)
thor (~> 0.18)
byebug (8.2.4)
capybara (2.7.0)
byebug (8.2.5)
capybara (2.7.1)
addressable
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
Expand All @@ -73,7 +64,7 @@ GEM
capybara-screenshot (1.0.12)
capybara (>= 1.0, < 3)
launchy
capybara-webkit (1.10.1)
capybara-webkit (1.11.1)
capybara (>= 2.3.0, < 2.8.0)
json
childprocess (0.5.9)
Expand All @@ -90,15 +81,15 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.10.0)
concurrent-ruby (1.0.1)
concurrent-ruby (1.0.2)
connection_pool (2.2.0)
coveralls (0.8.13)
json (~> 1.8)
simplecov (~> 0.11.0)
term-ansicolor (~> 1.3)
thor (~> 0.19.1)
tins (~> 1.6.0)
database_cleaner (1.5.1)
database_cleaner (1.5.3)
debug_inspector (0.0.2)
diff-lcs (1.2.5)
docile (1.1.5)
Expand All @@ -110,16 +101,13 @@ GEM
factory_girl (~> 4.7.0)
railties (>= 3.0.0)
ffi (1.9.10)
foreman (0.78.0)
foreman (0.81.0)
thor (~> 0.19.1)
generator_spec (0.9.3)
activesupport (>= 3.0.0)
railties (>= 3.0.0)
globalid (0.3.6)
activesupport (>= 4.1.0)
haml (4.0.7)
tilt
highline (1.7.8)
i18n (0.7.0)
interception (0.5)
io-like (0.3.0)
Expand All @@ -129,10 +117,11 @@ GEM
json (1.8.3)
launchy (2.4.3)
addressable (~> 2.3)
libv8 (3.16.14.13)
listen (3.0.6)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9.7)
libv8 (3.16.14.15)
listen (3.1.3)
rb-fsevent (~> 0.9, >= 0.9.7)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.4)
Expand All @@ -143,11 +132,11 @@ GEM
mime-types-data (3.2016.0221)
mini_portile2 (2.0.0)
minitest (5.8.4)
multi_json (1.11.2)
multi_json (1.12.0)
nio4r (1.2.1)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
parser (2.3.0.7)
parser (2.3.1.0)
ast (~> 2.2)
pg (0.18.4)
poltergeist (1.9.0)
Expand Down Expand Up @@ -175,21 +164,21 @@ GEM
binding_of_caller (>= 0.7)
pry (>= 0.9.11)
puma (3.4.0)
rack (2.0.0.alpha)
rack (2.0.0.rc1)
json
rack-test (0.6.3)
rack (>= 1.0)
rails (5.0.0.beta3)
actioncable (= 5.0.0.beta3)
actionmailer (= 5.0.0.beta3)
actionpack (= 5.0.0.beta3)
actionview (= 5.0.0.beta3)
activejob (= 5.0.0.beta3)
activemodel (= 5.0.0.beta3)
activerecord (= 5.0.0.beta3)
activesupport (= 5.0.0.beta3)
rails (5.0.0.rc1)
actioncable (= 5.0.0.rc1)
actionmailer (= 5.0.0.rc1)
actionpack (= 5.0.0.rc1)
actionview (= 5.0.0.rc1)
activejob (= 5.0.0.rc1)
activemodel (= 5.0.0.rc1)
activerecord (= 5.0.0.rc1)
activesupport (= 5.0.0.rc1)
bundler (>= 1.3.0, < 2.0)
railties (= 5.0.0.beta3)
railties (= 5.0.0.rc1)
sprockets-rails (>= 2.0.0)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
Expand All @@ -204,20 +193,21 @@ GEM
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railties (5.0.0.beta3)
actionpack (= 5.0.0.beta3)
activesupport (= 5.0.0.beta3)
railties (5.0.0.rc1)
actionpack (= 5.0.0.rc1)
activesupport (= 5.0.0.rc1)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.1.0)
rake (10.5.0)
rake (11.1.2)
rb-fsevent (0.9.7)
rb-inotify (0.9.7)
ffi (>= 0.5.0)
rdoc (4.2.2)
json (~> 1.4)
react_on_rails (5.1.1)
react_on_rails (6.0.0.rc.5)
addressable
connection_pool
execjs (~> 2.5)
foreman
Expand All @@ -243,32 +233,27 @@ GEM
rspec-retry (0.4.5)
rspec-core
rspec-support (3.5.0.beta3)
rubocop (0.39.0)
parser (>= 2.3.0.7, < 3.0)
rubocop (0.40.0)
parser (>= 2.3.1.0, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-lint (2.1.0)
parser (~> 2.2)
slop (~> 3.4, >= 3.4.7)
ruby-progressbar (1.7.5)
ruby2ruby (2.3.0)
ruby_parser (~> 3.1)
sexp_processor (~> 4.0)
ruby_parser (3.8.1)
sexp_processor (~> 4.1)
ruby-progressbar (1.8.0)
ruby_dep (1.3.1)
rubyzip (1.2.0)
safe_yaml (1.0.4)
sass (3.4.22)
sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
scss_lint (0.47.1)
rake (>= 0.9, < 11)
scss_lint (0.48.0)
rake (>= 0.9, < 12)
sass (~> 3.4.15)
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
Expand All @@ -277,15 +262,11 @@ GEM
childprocess (~> 0.5)
rubyzip (~> 1.0)
websocket (~> 1.0)
sexp_processor (4.7.0)
simplecov (0.11.2)
docile (~> 1.1.0)
json (~> 1.8)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
slim (3.0.6)
temple (~> 0.7.3)
tilt (>= 1.3.3, < 2.1)
slop (3.6.0)
spring (1.7.1)
spring-commands-rspec (1.0.4)
Expand All @@ -298,10 +279,8 @@ GEM
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.11)
temple (0.7.6)
term-ansicolor (1.3.2)
tins (~> 1.0)
terminal-table (1.5.2)
therubyracer (0.12.2)
libv8 (~> 3.16.14.0)
ref
Expand All @@ -313,7 +292,7 @@ GEM
thread_safe (~> 0.1)
uglifier (3.0.0)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.0.3)
unicode-display_width (1.0.5)
web-console (3.1.1)
activemodel (>= 4.2)
debug_inspector
Expand Down Expand Up @@ -356,11 +335,11 @@ DEPENDENCIES
pry-rescue
pry-stack_explorer
puma
rails (= 5.0.0.beta3)
rails (= 5.0.0.rc1)
rails-html-sanitizer
rails_12factor
rainbow
react_on_rails (~> 5.1.1)
react_on_rails (= 6.0.0.rc.5)
rspec-rails (= 3.5.0.beta3)
rspec-retry
rubocop
Expand All @@ -376,5 +355,8 @@ DEPENDENCIES
uglifier
web-console

RUBY VERSION
ruby 2.3.1p112

BUNDLED WITH
1.11.2
1.12.3
Loading