Skip to content

Commit defe695

Browse files
authored
Merge pull request shakacode#301 from shakacode/update-dependencies
Updated all available dependencies
2 parents 38bbb77 + 32f3b13 commit defe695

File tree

11 files changed

+1188
-1269
lines changed

11 files changed

+1188
-1269
lines changed

Diff for: .nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.0.0
1+
6.0.0

Diff for: .travis.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,12 @@ env:
1717
- CXX=g++-4.9
1818
install:
1919
- bundle install
20-
- nvm install 5.5
21-
- nvm use 5.5
20+
- nvm install 6.3
21+
- nvm use 6.3
2222
- npm install
2323
before_script:
2424
- export DISPLAY=:99.0
2525
- sh -e /etc/init.d/xvfb start
2626
script:
2727
- bundle exec rake db:schema:load
2828
- DRIVER=selenium_firefox bundle exec rake
29-
- bundle exec rake lint

Diff for: Gemfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ruby "2.3.1"
33

44
#
55
# Bundle edge Rails instead: gem "rails", github: "rails/rails"
6-
gem "rails", "5.0.0.rc1"
6+
gem "rails"
77
gem "listen"
88

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

44-
gem "react_on_rails", "~> 6.0.2"
44+
gem "react_on_rails", "~> 6"
4545

4646
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
4747
gem "therubyracer"

0 commit comments

Comments
 (0)