Skip to content

Commit 0066ca8

Browse files
committedNov 6, 2015
Update all ruby and npm to latest (not babel)
* Babel 6 is not quite ready
1 parent be246c2 commit 0066ca8

File tree

7 files changed

+3624
-1148
lines changed

7 files changed

+3624
-1148
lines changed
 

‎.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.12.7
1+
5.0

‎.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2.2
1+
2.2.3

‎Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
source "https://rubygems.org"
2-
ruby "2.2.2"
2+
ruby "2.2.3"
33

44
#
55
# Bundle edge Rails instead: gem "rails", github: "rails/rails"

‎Gemfile.lock

+7-9
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ GEM
4343
ast (2.1.0)
4444
astrolabe (1.3.1)
4545
parser (~> 2.2)
46-
autoprefixer-rails (6.0.3)
46+
autoprefixer-rails (6.1.0.1)
4747
execjs
4848
json
4949
awesome_print (1.6.1)
@@ -68,8 +68,7 @@ GEM
6868
bundler-audit (0.4.0)
6969
bundler (~> 1.2)
7070
thor (~> 0.18)
71-
byebug (5.0.0)
72-
columnize (= 0.9.0)
71+
byebug (8.0.0)
7372
capybara (2.5.0)
7473
mime-types (>= 1.16)
7574
nokogiri (>= 1.3.3)
@@ -92,7 +91,6 @@ GEM
9291
coffee-script-source
9392
execjs
9493
coffee-script-source (1.9.1.1)
95-
columnize (0.9.0)
9694
connection_pool (2.2.0)
9795
coveralls (0.8.3)
9896
json (~> 1.8)
@@ -155,8 +153,8 @@ GEM
155153
coderay (~> 1.1.0)
156154
method_source (~> 0.8.1)
157155
slop (~> 3.4)
158-
pry-byebug (3.2.0)
159-
byebug (~> 5.0)
156+
pry-byebug (3.3.0)
157+
byebug (~> 8.0)
160158
pry (~> 0.10)
161159
pry-doc (0.8.0)
162160
pry (~> 0.9)
@@ -205,10 +203,10 @@ GEM
205203
raindrops (0.15.0)
206204
rake (10.4.2)
207205
rdoc (4.2.0)
208-
react_on_rails (1.0.0.pre)
206+
react_on_rails (1.0.1)
209207
connection_pool
210208
execjs (~> 2.5)
211-
rails (>= 4.0)
209+
rails (>= 3.2)
212210
ref (2.0.0)
213211
rest-client (1.8.0)
214212
http-cookie (>= 1.0.2, < 2.0)
@@ -307,7 +305,7 @@ GEM
307305
unf (0.1.4)
308306
unf_ext
309307
unf_ext (0.0.7.1)
310-
unicorn (4.9.0)
308+
unicorn (5.0.0)
311309
kgio (~> 2.6)
312310
rack
313311
raindrops (~> 0.7)

‎app/views/pages/simple.html.erb

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
<h2>Using React (no Flux framework) + Rails Backend (with react_on_rails gem)</h2>
1+
<h2>Using React (no Flux framework) + Rails Backend (with
2+
<a href="https://github.com/shakacode/react_on_rails">react_on_rails gem</a>)</h2>
23
<p>This example is much simpler than the one using React + Redux and is appropriate when:</p>
34
<ul>
45
<li>No or minimal MVC</li>
56
<li>No async necessary</li>
7+
<li>No server rendering</li>
8+
<li>No pre-population of props</li>
69
</ul>
710
<hr/>
811

0 commit comments

Comments
 (0)