Skip to content

Commit 84096a4

Browse files
committed
upgraded to 3.0.0-rc1
1 parent abad587 commit 84096a4

File tree

4 files changed

+14
-20
lines changed

4 files changed

+14
-20
lines changed

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ gem "sdoc", group: :doc
3737
# Use Rails Html Sanitizer for HTML sanitization
3838
gem "rails-html-sanitizer"
3939

40-
gem "react_on_rails", git: "https://github.com/shakacode/react_on_rails.git", tag: "3.0.0-beta.1"
40+
gem "react_on_rails", "~> 3.0.0-rc.1"
4141

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

Gemfile.lock

+7-13
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
GIT
2-
remote: https://github.com/shakacode/react_on_rails.git
3-
revision: 562c58f2b37e13cecc86fd4bd4e85edb10acd86d
4-
tag: 3.0.0-beta.1
5-
specs:
6-
react_on_rails (3.0.0.beta.1)
7-
connection_pool
8-
execjs (~> 2.5)
9-
foreman
10-
rails (>= 3.2)
11-
rainbow (~> 2.1)
12-
131
GEM
142
remote: https://rubygems.org/
153
specs:
@@ -213,6 +201,12 @@ GEM
213201
rake (10.5.0)
214202
rdoc (4.2.1)
215203
json (~> 1.4)
204+
react_on_rails (3.0.0.rc.1)
205+
connection_pool
206+
execjs (~> 2.5)
207+
foreman
208+
rails (>= 3.2)
209+
rainbow (~> 2.1)
216210
ref (2.0.0)
217211
rest-client (1.8.0)
218212
http-cookie (>= 1.0.2, < 2.0)
@@ -352,7 +346,7 @@ DEPENDENCIES
352346
rails-html-sanitizer
353347
rails_12factor
354348
rainbow
355-
react_on_rails!
349+
react_on_rails (~> 3.0.0.pre.rc.1)
356350
rspec-rails
357351
rspec-retry
358352
rubocop

client/npm-shrinkwrap.json

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
"react-addons-pure-render-mixin": "^0.14.7",
7272
"react-bootstrap": "^0.28.2",
7373
"react-dom": "^0.14.7",
74-
"react-on-rails": "3.0.0-beta.1",
74+
"react-on-rails": "3.0.0-rc.1",
7575
"react-redux": "^4.1.2",
7676
"react-router": "^2.0.0-rc5",
7777
"redux": "^3.1.7",

0 commit comments

Comments
 (0)