Skip to content

update react_on_rails gem to latest 0.1.8 #105

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

Merged
merged 2 commits into from
Sep 29, 2015
Merged

update react_on_rails gem to latest 0.1.8 #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
361f433
update react_on_rails gem to latest 0.1.8
dylangrafmyre Sep 29, 2015
f43276d
Update scripts/lint for cd client && npm run lint
dylangrafmyre Sep 29, 2015
File filter

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 Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ gem "rails-html-sanitizer"
# Use Unicorn as the app server
gem "unicorn"

gem "react_on_rails", "~> 0.1.7"
gem "react_on_rails", "~> 0.1.8"
gem "therubyracer"

gem "autoprefixer-rails"
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ GEM
raindrops (0.15.0)
rake (10.4.2)
rdoc (4.2.0)
react_on_rails (0.1.7)
react_on_rails (0.1.8)
connection_pool
execjs (~> 2.5)
rails (>= 4.0)
Expand Down Expand Up @@ -353,7 +353,7 @@ DEPENDENCIES
rails-html-sanitizer
rails_12factor
rainbow
react_on_rails (~> 0.1.7)
react_on_rails (~> 0.1.8)
rspec-rails
rubocop
ruby-lint
Expand Down
1 change: 1 addition & 0 deletions app/assets/javascripts/application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

// Need to be on top to allow Poltergeist test to work with React.
//= require es5-shim/es5-shim
//= require react_on_rails

// It is important that generated/vendor-bundle must be before bootstrap since it is exposing jQuery and jQuery-ujs
//= require generated/vendor-bundle
Expand Down
2 changes: 1 addition & 1 deletion scripts/lint
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ echo Linting with ruby-lint
ruby-lint app config spec

echo Linting with eslint and jscs
(cd client && bin/lint)
(cd client && npm run lint)

scss-lint client/assets/stylesheets/*.scss app/assets/stylesheets/*.scss

Expand Down