Skip to content

Commit 7d40122

Browse files
committed
Merge pull request #157 from shakacode/update-react-on-rails
update to react_on_rails 1.0.3
2 parents 78f4676 + 27fcd13 commit 7d40122

File tree

1 file changed

+54
-52
lines changed

1 file changed

+54
-52
lines changed

Gemfile.lock

Lines changed: 54 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (4.2.4)
5-
actionpack (= 4.2.4)
6-
actionview (= 4.2.4)
7-
activejob (= 4.2.4)
4+
actionmailer (4.2.5)
5+
actionpack (= 4.2.5)
6+
actionview (= 4.2.5)
7+
activejob (= 4.2.5)
88
mail (~> 2.5, >= 2.5.4)
99
rails-dom-testing (~> 1.0, >= 1.0.5)
10-
actionpack (4.2.4)
11-
actionview (= 4.2.4)
12-
activesupport (= 4.2.4)
10+
actionpack (4.2.5)
11+
actionview (= 4.2.5)
12+
activesupport (= 4.2.5)
1313
rack (~> 1.6)
1414
rack-test (~> 0.6.2)
1515
rails-dom-testing (~> 1.0, >= 1.0.5)
1616
rails-html-sanitizer (~> 1.0, >= 1.0.2)
17-
actionview (4.2.4)
18-
activesupport (= 4.2.4)
17+
actionview (4.2.5)
18+
activesupport (= 4.2.5)
1919
builder (~> 3.1)
2020
erubis (~> 2.7.0)
2121
rails-dom-testing (~> 1.0, >= 1.0.5)
2222
rails-html-sanitizer (~> 1.0, >= 1.0.2)
23-
activejob (4.2.4)
24-
activesupport (= 4.2.4)
23+
activejob (4.2.5)
24+
activesupport (= 4.2.5)
2525
globalid (>= 0.3.0)
26-
activemodel (4.2.4)
27-
activesupport (= 4.2.4)
26+
activemodel (4.2.5)
27+
activesupport (= 4.2.5)
2828
builder (~> 3.1)
29-
activerecord (4.2.4)
30-
activemodel (= 4.2.4)
31-
activesupport (= 4.2.4)
29+
activerecord (4.2.5)
30+
activemodel (= 4.2.5)
31+
activesupport (= 4.2.5)
3232
arel (~> 6.0)
33-
activesupport (4.2.4)
33+
activesupport (4.2.5)
3434
i18n (~> 0.7)
3535
json (~> 1.7, >= 1.7.7)
3636
minitest (~> 5.1)
@@ -68,7 +68,7 @@ GEM
6868
bundler-audit (0.4.0)
6969
bundler (~> 1.2)
7070
thor (~> 0.18)
71-
byebug (8.0.0)
71+
byebug (8.2.0)
7272
capybara (2.5.0)
7373
mime-types (>= 1.16)
7474
nokogiri (>= 1.3.3)
@@ -78,7 +78,7 @@ GEM
7878
capybara-screenshot (1.0.11)
7979
capybara (>= 1.0, < 3)
8080
launchy
81-
childprocess (0.5.7)
81+
childprocess (0.5.8)
8282
ffi (~> 1.0, >= 1.0.11)
8383
chromedriver-helper (1.0.0)
8484
archive-zip (~> 0.7.0)
@@ -90,14 +90,15 @@ GEM
9090
coffee-script (2.4.1)
9191
coffee-script-source
9292
execjs
93-
coffee-script-source (1.9.1.1)
93+
coffee-script-source (1.10.0)
9494
connection_pool (2.2.0)
95-
coveralls (0.8.3)
95+
coveralls (0.8.9)
9696
json (~> 1.8)
9797
rest-client (>= 1.6.8, < 2)
9898
simplecov (~> 0.10.0)
9999
term-ansicolor (~> 1.3)
100100
thor (~> 0.19.1)
101+
tins (~> 1.6.0)
101102
database_cleaner (1.5.1)
102103
debug_inspector (0.0.2)
103104
diff-lcs (1.2.5)
@@ -143,11 +144,11 @@ GEM
143144
minitest (5.8.2)
144145
multi_json (1.11.2)
145146
netrc (0.11.0)
146-
nokogiri (1.6.6.2)
147+
nokogiri (1.6.6.3)
147148
mini_portile (~> 0.6.0)
148149
parser (2.2.3.0)
149150
ast (>= 1.1, < 3.0)
150-
pg (0.18.3)
151+
pg (0.18.4)
151152
powerpack (0.1.1)
152153
pry (0.10.3)
153154
coderay (~> 1.1.0)
@@ -170,16 +171,16 @@ GEM
170171
rack (1.6.4)
171172
rack-test (0.6.3)
172173
rack (>= 1.0)
173-
rails (4.2.4)
174-
actionmailer (= 4.2.4)
175-
actionpack (= 4.2.4)
176-
actionview (= 4.2.4)
177-
activejob (= 4.2.4)
178-
activemodel (= 4.2.4)
179-
activerecord (= 4.2.4)
180-
activesupport (= 4.2.4)
174+
rails (4.2.5)
175+
actionmailer (= 4.2.5)
176+
actionpack (= 4.2.5)
177+
actionview (= 4.2.5)
178+
activejob (= 4.2.5)
179+
activemodel (= 4.2.5)
180+
activerecord (= 4.2.5)
181+
activesupport (= 4.2.5)
181182
bundler (>= 1.3.0, < 2.0)
182-
railties (= 4.2.4)
183+
railties (= 4.2.5)
183184
sprockets-rails
184185
rails-deprecated_sanitizer (1.0.3)
185186
activesupport (>= 4.2.0.alpha)
@@ -194,16 +195,16 @@ GEM
194195
rails_stdout_logging
195196
rails_serve_static_assets (0.0.4)
196197
rails_stdout_logging (0.0.4)
197-
railties (4.2.4)
198-
actionpack (= 4.2.4)
199-
activesupport (= 4.2.4)
198+
railties (4.2.5)
199+
actionpack (= 4.2.5)
200+
activesupport (= 4.2.5)
200201
rake (>= 0.8.7)
201202
thor (>= 0.18.1, < 2.0)
202203
rainbow (2.0.0)
203204
raindrops (0.15.0)
204205
rake (10.4.2)
205206
rdoc (4.2.0)
206-
react_on_rails (1.0.1)
207+
react_on_rails (1.0.3)
207208
connection_pool
208209
execjs (~> 2.5)
209210
rails (>= 3.2)
@@ -212,29 +213,30 @@ GEM
212213
http-cookie (>= 1.0.2, < 2.0)
213214
mime-types (>= 1.16, < 3.0)
214215
netrc (~> 0.7)
215-
rspec-core (3.3.2)
216-
rspec-support (~> 3.3.0)
217-
rspec-expectations (3.3.1)
216+
rspec-core (3.4.0)
217+
rspec-support (~> 3.4.0)
218+
rspec-expectations (3.4.0)
218219
diff-lcs (>= 1.2.0, < 2.0)
219-
rspec-support (~> 3.3.0)
220-
rspec-mocks (3.3.2)
220+
rspec-support (~> 3.4.0)
221+
rspec-mocks (3.4.0)
221222
diff-lcs (>= 1.2.0, < 2.0)
222-
rspec-support (~> 3.3.0)
223-
rspec-rails (3.3.3)
223+
rspec-support (~> 3.4.0)
224+
rspec-rails (3.4.0)
224225
actionpack (>= 3.0, < 4.3)
225226
activesupport (>= 3.0, < 4.3)
226227
railties (>= 3.0, < 4.3)
227-
rspec-core (~> 3.3.0)
228-
rspec-expectations (~> 3.3.0)
229-
rspec-mocks (~> 3.3.0)
230-
rspec-support (~> 3.3.0)
231-
rspec-support (3.3.0)
232-
rubocop (0.34.2)
228+
rspec-core (~> 3.4.0)
229+
rspec-expectations (~> 3.4.0)
230+
rspec-mocks (~> 3.4.0)
231+
rspec-support (~> 3.4.0)
232+
rspec-support (3.4.0)
233+
rubocop (0.35.1)
233234
astrolabe (~> 1.3)
234-
parser (>= 2.2.2.5, < 3.0)
235+
parser (>= 2.2.3.0, < 3.0)
235236
powerpack (~> 0.1)
236237
rainbow (>= 1.99.1, < 3.0)
237-
ruby-progressbar (~> 1.4)
238+
ruby-progressbar (~> 1.7)
239+
tins (<= 1.6.0)
238240
ruby-lint (2.0.5)
239241
parser (~> 2.2)
240242
slop (~> 3.4, >= 3.4.7)
@@ -274,7 +276,7 @@ GEM
274276
temple (~> 0.7.3)
275277
tilt (>= 1.3.3, < 2.1)
276278
slop (3.6.0)
277-
spring (1.4.0)
279+
spring (1.4.3)
278280
spring-commands-rspec (1.0.4)
279281
spring (>= 0.9.1)
280282
sprockets (3.4.0)

0 commit comments

Comments
 (0)