Skip to content

Commit f9f045e

Browse files
committed
Update libraries, but not bootstrap-loader
* bootstrap-loader requires breaking changes of removal of Input * Tests not passing
1 parent 48d80a3 commit f9f045e

File tree

23 files changed

+156
-5594
lines changed

23 files changed

+156
-5594
lines changed

Gemfile.lock

Lines changed: 65 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,67 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (5.0.0)
5-
actionpack (= 5.0.0)
4+
actioncable (5.0.0.1)
5+
actionpack (= 5.0.0.1)
66
nio4r (~> 1.2)
77
websocket-driver (~> 0.6.1)
8-
actionmailer (5.0.0)
9-
actionpack (= 5.0.0)
10-
actionview (= 5.0.0)
11-
activejob (= 5.0.0)
8+
actionmailer (5.0.0.1)
9+
actionpack (= 5.0.0.1)
10+
actionview (= 5.0.0.1)
11+
activejob (= 5.0.0.1)
1212
mail (~> 2.5, >= 2.5.4)
1313
rails-dom-testing (~> 2.0)
14-
actionpack (5.0.0)
15-
actionview (= 5.0.0)
16-
activesupport (= 5.0.0)
14+
actionpack (5.0.0.1)
15+
actionview (= 5.0.0.1)
16+
activesupport (= 5.0.0.1)
1717
rack (~> 2.0)
1818
rack-test (~> 0.6.3)
1919
rails-dom-testing (~> 2.0)
2020
rails-html-sanitizer (~> 1.0, >= 1.0.2)
21-
actionview (5.0.0)
22-
activesupport (= 5.0.0)
21+
actionview (5.0.0.1)
22+
activesupport (= 5.0.0.1)
2323
builder (~> 3.1)
2424
erubis (~> 2.7.0)
2525
rails-dom-testing (~> 2.0)
2626
rails-html-sanitizer (~> 1.0, >= 1.0.2)
27-
activejob (5.0.0)
28-
activesupport (= 5.0.0)
27+
activejob (5.0.0.1)
28+
activesupport (= 5.0.0.1)
2929
globalid (>= 0.3.6)
30-
activemodel (5.0.0)
31-
activesupport (= 5.0.0)
32-
activerecord (5.0.0)
33-
activemodel (= 5.0.0)
34-
activesupport (= 5.0.0)
30+
activemodel (5.0.0.1)
31+
activesupport (= 5.0.0.1)
32+
activerecord (5.0.0.1)
33+
activemodel (= 5.0.0.1)
34+
activesupport (= 5.0.0.1)
3535
arel (~> 7.0)
36-
activesupport (5.0.0)
36+
activesupport (5.0.0.1)
3737
concurrent-ruby (~> 1.0, >= 1.0.2)
3838
i18n (~> 0.7)
3939
minitest (~> 5.1)
4040
tzinfo (~> 1.1)
4141
addressable (2.4.0)
4242
archive-zip (0.7.0)
4343
io-like (~> 0.3.0)
44-
arel (7.1.1)
44+
arel (7.1.4)
4545
ast (2.3.0)
46-
autoprefixer-rails (6.4.0.1)
46+
autoprefixer-rails (6.5.1.1)
4747
execjs
4848
awesome_print (1.7.0)
4949
binding_of_caller (0.7.2)
5050
debug_inspector (>= 0.0.1)
51-
brakeman (3.3.3)
51+
brakeman (3.4.1)
5252
builder (3.2.2)
5353
bundler-audit (0.5.0)
5454
bundler (~> 1.2)
5555
thor (~> 0.18)
56-
byebug (9.0.5)
56+
byebug (9.0.6)
5757
capybara (2.7.1)
5858
addressable
5959
mime-types (>= 1.16)
6060
nokogiri (>= 1.3.3)
6161
rack (>= 1.0.0)
6262
rack-test (>= 0.5.4)
6363
xpath (~> 2.0)
64-
capybara-screenshot (1.0.13)
64+
capybara-screenshot (1.0.14)
6565
capybara (>= 1.0, < 3)
6666
launchy
6767
capybara-webkit (1.11.1)
@@ -117,7 +117,7 @@ GEM
117117
json (1.8.3)
118118
launchy (2.4.3)
119119
addressable (~> 2.3)
120-
libv8 (5.0.71.48.3)
120+
libv8 (5.3.332.38.1)
121121
listen (3.1.5)
122122
rb-fsevent (~> 0.9, >= 0.9.4)
123123
rb-inotify (~> 0.9, >= 0.9.7)
@@ -131,19 +131,17 @@ GEM
131131
mime-types-data (~> 3.2015)
132132
mime-types-data (3.2016.0521)
133133
mini_portile2 (2.1.0)
134-
mini_racer (0.1.4)
135-
libv8 (~> 5.0, < 5.1.11)
136-
minitest (5.9.0)
134+
mini_racer (0.1.7)
135+
libv8 (~> 5.3)
136+
minitest (5.9.1)
137137
multi_json (1.12.1)
138138
nio4r (1.2.1)
139-
nokogiri (1.6.8)
139+
nokogiri (1.6.8.1)
140140
mini_portile2 (~> 2.1.0)
141-
pkg-config (~> 1.1.7)
142-
parser (2.3.1.2)
141+
parser (2.3.1.4)
143142
ast (~> 2.2)
144-
pg (0.18.4)
145-
pkg-config (1.1.7)
146-
poltergeist (1.10.0)
143+
pg (0.19.0)
144+
poltergeist (1.11.0)
147145
capybara (~> 2.1)
148146
cliver (~> 0.3.1)
149147
websocket-driver (>= 0.2.0)
@@ -170,17 +168,17 @@ GEM
170168
rack (2.0.1)
171169
rack-test (0.6.3)
172170
rack (>= 1.0)
173-
rails (5.0.0)
174-
actioncable (= 5.0.0)
175-
actionmailer (= 5.0.0)
176-
actionpack (= 5.0.0)
177-
actionview (= 5.0.0)
178-
activejob (= 5.0.0)
179-
activemodel (= 5.0.0)
180-
activerecord (= 5.0.0)
181-
activesupport (= 5.0.0)
171+
rails (5.0.0.1)
172+
actioncable (= 5.0.0.1)
173+
actionmailer (= 5.0.0.1)
174+
actionpack (= 5.0.0.1)
175+
actionview (= 5.0.0.1)
176+
activejob (= 5.0.0.1)
177+
activemodel (= 5.0.0.1)
178+
activerecord (= 5.0.0.1)
179+
activesupport (= 5.0.0.1)
182180
bundler (>= 1.3.0, < 2.0)
183-
railties (= 5.0.0)
181+
railties (= 5.0.0.1)
184182
sprockets-rails (>= 2.0.0)
185183
rails-dom-testing (2.0.1)
186184
activesupport (>= 4.2.0, < 6.0)
@@ -192,20 +190,20 @@ GEM
192190
rails_stdout_logging
193191
rails_serve_static_assets (0.0.5)
194192
rails_stdout_logging (0.0.5)
195-
railties (5.0.0)
196-
actionpack (= 5.0.0)
197-
activesupport (= 5.0.0)
193+
railties (5.0.0.1)
194+
actionpack (= 5.0.0.1)
195+
activesupport (= 5.0.0.1)
198196
method_source
199197
rake (>= 0.8.7)
200198
thor (>= 0.18.1, < 2.0)
201199
rainbow (2.1.0)
202-
rake (11.2.2)
203-
rb-fsevent (0.9.7)
200+
rake (11.3.0)
201+
rb-fsevent (0.9.8)
204202
rb-inotify (0.9.7)
205203
ffi (>= 0.5.0)
206204
rdoc (4.2.2)
207205
json (~> 1.4)
208-
react_on_rails (6.1.0)
206+
react_on_rails (6.1.2)
209207
addressable
210208
connection_pool
211209
execjs (~> 2.5)
@@ -228,20 +226,20 @@ GEM
228226
rspec-expectations (= 3.5.0.beta3)
229227
rspec-mocks (= 3.5.0.beta3)
230228
rspec-support (= 3.5.0.beta3)
231-
rspec-retry (0.5.0)
232-
rspec-core (~> 3.3)
229+
rspec-retry (0.5.2)
230+
rspec-core (> 3.3, < 3.6)
233231
rspec-support (3.5.0.beta3)
234-
rubocop (0.42.0)
232+
rubocop (0.45.0)
235233
parser (>= 2.3.1.1, < 3.0)
236234
powerpack (~> 0.1)
237235
rainbow (>= 1.99.1, < 3.0)
238236
ruby-progressbar (~> 1.7)
239237
unicode-display_width (~> 1.0, >= 1.0.1)
240-
ruby-lint (2.3.0)
238+
ruby-lint (2.3.1)
241239
parser (~> 2.2)
242240
slop (~> 3.4, >= 3.4.7)
243241
ruby-progressbar (1.8.1)
244-
ruby_dep (1.4.0)
242+
ruby_dep (1.5.0)
245243
rubyzip (1.2.0)
246244
sass (3.4.22)
247245
sass-rails (5.0.6)
@@ -250,13 +248,13 @@ GEM
250248
sprockets (>= 2.8, < 4.0)
251249
sprockets-rails (>= 2.0, < 4.0)
252250
tilt (>= 1.1, < 3)
253-
scss_lint (0.49.0)
251+
scss_lint (0.50.2)
254252
rake (>= 0.9, < 12)
255253
sass (~> 3.4.20)
256-
sdoc (0.4.1)
254+
sdoc (0.4.2)
257255
json (~> 1.7, >= 1.7.7)
258256
rdoc (~> 4.0)
259-
selenium-webdriver (2.53.4)
257+
selenium-webdriver (3.0.0)
260258
childprocess (~> 0.5)
261259
rubyzip (~> 1.0)
262260
websocket (~> 1.0)
@@ -266,29 +264,30 @@ GEM
266264
simplecov-html (~> 0.10.0)
267265
simplecov-html (0.10.0)
268266
slop (3.6.0)
269-
spring (1.7.2)
267+
spring (2.0.0)
268+
activesupport (>= 4.2)
270269
spring-commands-rspec (1.0.4)
271270
spring (>= 0.9.1)
272271
sprockets (3.7.0)
273272
concurrent-ruby (~> 1.0)
274273
rack (> 1, < 3)
275-
sprockets-rails (3.1.1)
274+
sprockets-rails (3.2.0)
276275
actionpack (>= 4.0)
277276
activesupport (>= 4.0)
278277
sprockets (>= 3.0.0)
279-
sqlite3 (1.3.11)
280-
term-ansicolor (1.3.2)
278+
sqlite3 (1.3.12)
279+
term-ansicolor (1.4.0)
281280
tins (~> 1.0)
282281
thor (0.19.1)
283282
thread_safe (0.3.5)
284283
tilt (2.0.5)
285284
tins (1.12.0)
286285
tzinfo (1.2.2)
287286
thread_safe (~> 0.1)
288-
uglifier (3.0.1)
287+
uglifier (3.0.3)
289288
execjs (>= 0.3.0, < 3)
290-
unicode-display_width (1.1.0)
291-
web-console (3.3.1)
289+
unicode-display_width (1.1.1)
290+
web-console (3.4.0)
292291
actionview (>= 5.0)
293292
activemodel (>= 5.0)
294293
debug_inspector
@@ -355,4 +354,4 @@ RUBY VERSION
355354
ruby 2.3.1p112
356355

357356
BUNDLED WITH
358-
1.12.5
357+
1.13.5

client/.eslintrc.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,10 @@ env:
1717

1818
rules:
1919
### Imports
20-
# Can't do next one because of alias in webpack
20+
# Can't do next two because of alias in webpack
2121
import/no-unresolved: 0
22-
import/extensions: [2, { js: "never", jsx: "never" }]
2322

2423
# https://github.com/benmosher/eslint-plugin-import/issues/340
2524
import/no-extraneous-dependencies: 0
2625

27-
# https://github.com/eslint/eslint/issues/6876 SFC's marked as invalid
28-
new-cap: 0
26+
import/extensions: [2, { js: "never", jsx: "never" }]

client/.jscsrc

Lines changed: 0 additions & 19 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import { PropTypes } from 'react';
2+
3+
export default PropTypes.arrayOf(PropTypes.shape({ type: PropTypes.string })).isRequired;

client/app/bundles/comments/actions/commentsActionCreators.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export function submitCommentFailure(error) {
4242
}
4343

4444
export function fetchComments() {
45-
return dispatch => {
45+
return (dispatch) => {
4646
dispatch(setIsFetching());
4747
return (
4848
requestsManager
@@ -54,7 +54,7 @@ export function fetchComments() {
5454
}
5555

5656
export function submitComment(comment) {
57-
return dispatch => {
57+
return (dispatch) => {
5858
dispatch(setIsSaving());
5959
return (
6060
requestsManager

client/app/bundles/comments/components/CommentBox/CommentBox.jsx

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
11
import BaseComponent from 'libs/components/BaseComponent';
22
import React, { PropTypes } from 'react';
33

4+
import actionPropTypes from '../../actions/actionPropTypes';
45
import CommentForm from './CommentForm/CommentForm';
5-
import CommentList from './CommentList/CommentList';
6+
import CommentList, { CommentPropTypes } from './CommentList/CommentList';
67
import css from './CommentBox.scss';
78

89
export default class CommentBox extends BaseComponent {
910
static propTypes = {
1011
pollInterval: PropTypes.number.isRequired,
11-
actions: PropTypes.object.isRequired,
12-
data: PropTypes.object.isRequired,
12+
actions: actionPropTypes,
13+
data: PropTypes.shape({
14+
isFetching: React.PropTypes.boolean,
15+
isSaving: React.PropTypes.boolean,
16+
submitCommentError: React.PropTypes.string,
17+
$$comments: React.PropTypes.arrayOf(CommentPropTypes),
18+
}).isRequired,
1319
};
1420

1521
componentDidMount() {

0 commit comments

Comments
 (0)