Skip to content

Commit d229444

Browse files
committed
Updated gem and npm dependencies
Noteworthy: * Updated the linters to eslint-config-shakacode v3!
1 parent 5b87871 commit d229444

File tree

9 files changed

+672
-717
lines changed

9 files changed

+672
-717
lines changed

Diff for: Gemfile.lock

+64-79
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.5.1)
5-
actionpack (= 4.2.5.1)
6-
actionview (= 4.2.5.1)
7-
activejob (= 4.2.5.1)
4+
actionmailer (4.2.5.2)
5+
actionpack (= 4.2.5.2)
6+
actionview (= 4.2.5.2)
7+
activejob (= 4.2.5.2)
88
mail (~> 2.5, >= 2.5.4)
99
rails-dom-testing (~> 1.0, >= 1.0.5)
10-
actionpack (4.2.5.1)
11-
actionview (= 4.2.5.1)
12-
activesupport (= 4.2.5.1)
10+
actionpack (4.2.5.2)
11+
actionview (= 4.2.5.2)
12+
activesupport (= 4.2.5.2)
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.5.1)
18-
activesupport (= 4.2.5.1)
17+
actionview (4.2.5.2)
18+
activesupport (= 4.2.5.2)
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.5.1)
24-
activesupport (= 4.2.5.1)
23+
activejob (4.2.5.2)
24+
activesupport (= 4.2.5.2)
2525
globalid (>= 0.3.0)
26-
activemodel (4.2.5.1)
27-
activesupport (= 4.2.5.1)
26+
activemodel (4.2.5.2)
27+
activesupport (= 4.2.5.2)
2828
builder (~> 3.1)
29-
activerecord (4.2.5.1)
30-
activemodel (= 4.2.5.1)
31-
activesupport (= 4.2.5.1)
29+
activerecord (4.2.5.2)
30+
activemodel (= 4.2.5.2)
31+
activesupport (= 4.2.5.2)
3232
arel (~> 6.0)
33-
activesupport (4.2.5.1)
33+
activesupport (4.2.5.2)
3434
i18n (~> 0.7)
3535
json (~> 1.7, >= 1.7.7)
3636
minitest (~> 5.1)
@@ -41,29 +41,26 @@ GEM
4141
io-like (~> 0.3.0)
4242
arel (6.0.3)
4343
ast (2.2.0)
44-
autoprefixer-rails (6.3.1)
44+
autoprefixer-rails (6.3.3.1)
4545
execjs
46-
json
4746
awesome_print (1.6.1)
4847
binding_of_caller (0.7.2)
4948
debug_inspector (>= 0.0.1)
50-
brakeman (3.1.5)
49+
brakeman (3.2.1)
5150
erubis (~> 2.6)
52-
fastercsv (~> 1.5)
5351
haml (>= 3.0, < 5.0)
5452
highline (>= 1.6.20, < 2.0)
55-
multi_json (~> 1.2)
56-
ruby2ruby (>= 2.1.1, < 2.3.0)
57-
ruby_parser (~> 3.7.0)
53+
ruby2ruby (~> 2.3.0)
54+
ruby_parser (~> 3.8.1)
5855
safe_yaml (>= 1.0)
5956
sass (~> 3.0)
6057
slim (>= 1.3.6, < 4.0)
6158
terminal-table (~> 1.4)
6259
builder (3.2.2)
63-
bundler-audit (0.4.0)
60+
bundler-audit (0.5.0)
6461
bundler (~> 1.2)
6562
thor (~> 0.18)
66-
byebug (8.2.1)
63+
byebug (8.2.2)
6764
capybara (2.6.2)
6865
addressable
6966
mime-types (>= 1.16)
@@ -79,19 +76,18 @@ GEM
7976
chromedriver-helper (1.0.0)
8077
archive-zip (~> 0.7.0)
8178
nokogiri (~> 1.6)
82-
coderay (1.1.0)
79+
coderay (1.1.1)
8380
coffee-rails (4.1.1)
8481
coffee-script (>= 2.2.0)
8582
railties (>= 4.0.0, < 5.1.x)
8683
coffee-script (2.4.1)
8784
coffee-script-source
8885
execjs
8986
coffee-script-source (1.10.0)
90-
concurrent-ruby (1.0.0)
87+
concurrent-ruby (1.0.1)
9188
connection_pool (2.2.0)
92-
coveralls (0.8.10)
89+
coveralls (0.8.13)
9390
json (~> 1.8)
94-
rest-client (>= 1.6.8, < 2)
9591
simplecov (~> 0.11.0)
9692
term-ansicolor (~> 1.3)
9793
thor (~> 0.19.1)
@@ -100,16 +96,13 @@ GEM
10096
debug_inspector (0.0.2)
10197
diff-lcs (1.2.5)
10298
docile (1.1.5)
103-
domain_name (0.5.20160128)
104-
unf (>= 0.0.5, < 1.0.0)
10599
erubis (2.7.0)
106100
execjs (2.6.0)
107101
factory_girl (4.5.0)
108102
activesupport (>= 3.0.0)
109-
factory_girl_rails (4.5.0)
103+
factory_girl_rails (4.6.0)
110104
factory_girl (~> 4.5.0)
111105
railties (>= 3.0.0)
112-
fastercsv (1.5.5)
113106
ffi (1.9.10)
114107
foreman (0.78.0)
115108
thor (~> 0.19.1)
@@ -118,12 +111,10 @@ GEM
118111
haml (4.0.7)
119112
tilt
120113
highline (1.7.8)
121-
http-cookie (1.0.2)
122-
domain_name (~> 0.5)
123114
i18n (0.7.0)
124115
interception (0.5)
125116
io-like (0.3.0)
126-
jbuilder (2.4.0)
117+
jbuilder (2.4.1)
127118
activesupport (>= 3.0.0, < 5.1)
128119
multi_json (~> 1.2)
129120
json (1.8.3)
@@ -135,14 +126,13 @@ GEM
135126
mail (2.6.3)
136127
mime-types (>= 1.16, < 3)
137128
method_source (0.8.2)
138-
mime-types (2.99)
129+
mime-types (2.99.1)
139130
mini_portile2 (2.0.0)
140131
minitest (5.8.4)
141132
multi_json (1.11.2)
142-
netrc (0.11.0)
143133
nokogiri (1.6.7.2)
144134
mini_portile2 (~> 2.0.0.rc2)
145-
parser (2.3.0.2)
135+
parser (2.3.0.6)
146136
ast (~> 2.2)
147137
pg (0.18.4)
148138
powerpack (0.1.1)
@@ -164,20 +154,20 @@ GEM
164154
pry-stack_explorer (0.4.9.2)
165155
binding_of_caller (>= 0.7)
166156
pry (>= 0.9.11)
167-
puma (2.16.0)
157+
puma (3.0.2)
168158
rack (1.6.4)
169159
rack-test (0.6.3)
170160
rack (>= 1.0)
171-
rails (4.2.5.1)
172-
actionmailer (= 4.2.5.1)
173-
actionpack (= 4.2.5.1)
174-
actionview (= 4.2.5.1)
175-
activejob (= 4.2.5.1)
176-
activemodel (= 4.2.5.1)
177-
activerecord (= 4.2.5.1)
178-
activesupport (= 4.2.5.1)
161+
rails (4.2.5.2)
162+
actionmailer (= 4.2.5.2)
163+
actionpack (= 4.2.5.2)
164+
actionview (= 4.2.5.2)
165+
activejob (= 4.2.5.2)
166+
activemodel (= 4.2.5.2)
167+
activerecord (= 4.2.5.2)
168+
activesupport (= 4.2.5.2)
179169
bundler (>= 1.3.0, < 2.0)
180-
railties (= 4.2.5.1)
170+
railties (= 4.2.5.2)
181171
sprockets-rails
182172
rails-deprecated_sanitizer (1.0.3)
183173
activesupport (>= 4.2.0.alpha)
@@ -190,37 +180,33 @@ GEM
190180
rails_12factor (0.0.3)
191181
rails_serve_static_assets
192182
rails_stdout_logging
193-
rails_serve_static_assets (0.0.4)
183+
rails_serve_static_assets (0.0.5)
194184
rails_stdout_logging (0.0.4)
195-
railties (4.2.5.1)
196-
actionpack (= 4.2.5.1)
197-
activesupport (= 4.2.5.1)
185+
railties (4.2.5.2)
186+
actionpack (= 4.2.5.2)
187+
activesupport (= 4.2.5.2)
198188
rake (>= 0.8.7)
199189
thor (>= 0.18.1, < 2.0)
200190
rainbow (2.1.0)
201191
rake (10.5.0)
202-
rdoc (4.2.1)
192+
rdoc (4.2.2)
203193
json (~> 1.4)
204-
react_on_rails (3.0.0.rc.1)
194+
react_on_rails (3.0.6)
205195
connection_pool
206196
execjs (~> 2.5)
207197
foreman
208198
rails (>= 3.2)
209199
rainbow (~> 2.1)
210200
ref (2.0.0)
211-
rest-client (1.8.0)
212-
http-cookie (>= 1.0.2, < 2.0)
213-
mime-types (>= 1.16, < 3.0)
214-
netrc (~> 0.7)
215-
rspec-core (3.4.2)
201+
rspec-core (3.4.3)
216202
rspec-support (~> 3.4.0)
217203
rspec-expectations (3.4.0)
218204
diff-lcs (>= 1.2.0, < 2.0)
219205
rspec-support (~> 3.4.0)
220206
rspec-mocks (3.4.1)
221207
diff-lcs (>= 1.2.0, < 2.0)
222208
rspec-support (~> 3.4.0)
223-
rspec-rails (3.4.1)
209+
rspec-rails (3.4.2)
224210
actionpack (>= 3.0, < 4.3)
225211
activesupport (>= 3.0, < 4.3)
226212
railties (>= 3.0, < 4.3)
@@ -231,21 +217,22 @@ GEM
231217
rspec-retry (0.4.5)
232218
rspec-core
233219
rspec-support (3.4.1)
234-
rubocop (0.36.0)
235-
parser (>= 2.3.0.0, < 3.0)
220+
rubocop (0.37.2)
221+
parser (>= 2.3.0.4, < 3.0)
236222
powerpack (~> 0.1)
237223
rainbow (>= 1.99.1, < 3.0)
238224
ruby-progressbar (~> 1.7)
225+
unicode-display_width (~> 0.3)
239226
ruby-lint (2.1.0)
240227
parser (~> 2.2)
241228
slop (~> 3.4, >= 3.4.7)
242229
ruby-progressbar (1.7.5)
243-
ruby2ruby (2.2.0)
230+
ruby2ruby (2.3.0)
244231
ruby_parser (~> 3.1)
245232
sexp_processor (~> 4.0)
246-
ruby_parser (3.7.3)
233+
ruby_parser (3.8.1)
247234
sexp_processor (~> 4.1)
248-
rubyzip (1.1.7)
235+
rubyzip (1.2.0)
249236
safe_yaml (1.0.4)
250237
sass (3.4.21)
251238
sass-rails (5.0.4)
@@ -254,19 +241,19 @@ GEM
254241
sprockets (>= 2.8, < 4.0)
255242
sprockets-rails (>= 2.0, < 4.0)
256243
tilt (>= 1.1, < 3)
257-
scss_lint (0.44.0)
258-
rake (~> 10.0)
244+
scss_lint (0.47.1)
245+
rake (>= 0.9, < 11)
259246
sass (~> 3.4.15)
260247
sdoc (0.4.1)
261248
json (~> 1.7, >= 1.7.7)
262249
rdoc (~> 4.0)
263-
selenium-webdriver (2.50.0)
250+
selenium-webdriver (2.52.0)
264251
childprocess (~> 0.5)
265252
multi_json (~> 1.0)
266253
rubyzip (~> 1.0)
267254
websocket (~> 1.0)
268-
sexp_processor (4.6.1)
269-
simplecov (0.11.1)
255+
sexp_processor (4.7.0)
256+
simplecov (0.11.2)
270257
docile (~> 1.1.0)
271258
json (~> 1.8)
272259
simplecov-html (~> 0.10.0)
@@ -275,13 +262,13 @@ GEM
275262
temple (~> 0.7.3)
276263
tilt (>= 1.3.3, < 2.1)
277264
slop (3.6.0)
278-
spring (1.6.2)
265+
spring (1.6.4)
279266
spring-commands-rspec (1.0.4)
280267
spring (>= 0.9.1)
281268
sprockets (3.5.2)
282269
concurrent-ruby (~> 1.0)
283270
rack (> 1, < 3)
284-
sprockets-rails (3.0.1)
271+
sprockets-rails (3.0.4)
285272
actionpack (>= 4.0)
286273
activesupport (>= 4.0)
287274
sprockets (>= 3.0.0)
@@ -297,17 +284,15 @@ GEM
297284
thread_safe (0.3.5)
298285
tilt (2.0.2)
299286
tins (1.6.0)
300-
turbolinks (5.0.0.beta1)
287+
turbolinks (5.0.0.beta2)
301288
turbolinks-source
302-
turbolinks-source (5.0.0.beta1.1)
289+
turbolinks-source (5.0.0.beta2)
303290
tzinfo (1.2.2)
304291
thread_safe (~> 0.1)
305292
uglifier (2.7.2)
306293
execjs (>= 0.3.0)
307294
json (>= 1.8.0)
308-
unf (0.1.4)
309-
unf_ext
310-
unf_ext (0.0.7.1)
295+
unicode-display_width (0.3.1)
311296
web-console (3.1.1)
312297
activemodel (>= 4.2)
313298
debug_inspector

Diff for: client/app/bundles/comments/components/CommentBox/CommentBox.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export default class CommentBox extends BaseComponent {
3838
</h2>
3939
<p>
4040
<b>Text</b> supports Github Flavored Markdown.
41-
Comments older than 24 hours are deleted.<br/>
41+
Comments older than 24 hours are deleted.<br />
4242
<b>Name</b> is preserved. <b>Text</b> is reset, between submits.
4343
</p>
4444
<CommentForm

Diff for: client/app/bundles/comments/components/CommentBox/CommentList/Comment/Comment.spec.jsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const {
1111
describe('Comment', () => {
1212
it('renders an author and comment with proper css classes', () => {
1313
const component = renderIntoDocument(
14-
<Comment author="Frank" text="Hi!"/>
14+
<Comment author="Frank" text="Hi!" />
1515
);
1616

1717
// TODO: Setup testing of CSS Modules classNames
@@ -25,7 +25,7 @@ describe('Comment', () => {
2525

2626
it('shows the author', () => {
2727
const component = renderIntoDocument(
28-
<Comment author="Frank" text="Hi!"/>
28+
<Comment author="Frank" text="Hi!" />
2929
);
3030

3131
const author = findRenderedDOMComponentWithClass(component, 'js-comment-author');
@@ -34,7 +34,7 @@ describe('Comment', () => {
3434

3535
it('shows the comment text in markdown', () => {
3636
const component = renderIntoDocument(
37-
<Comment author="Frank" text="Hi!"/>
37+
<Comment author="Frank" text="Hi!" />
3838
);
3939

4040
const comment = findRenderedDOMComponentWithClass(component, 'js-comment-text');

Diff for: client/app/bundles/comments/components/SimpleCommentScreen/SimpleCommentScreen.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export default class SimpleCommentScreen extends BaseComponent {
7878
<div className="commentBox container">
7979
<h2>Comments</h2>
8080
<p>
81-
Text take Github Flavored Markdown. Comments older than 24 hours are deleted.<br/>
81+
Text take Github Flavored Markdown. Comments older than 24 hours are deleted.<br />
8282
<b>Name</b> is preserved. <b>Text</b> is reset, between submits.
8383
</p>
8484
<CommentForm

Diff for: client/app/libs/components/BaseComponent.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react';
22
import PureRenderMixin from 'react-addons-pure-render-mixin';
33

44
export default class BaseComponent extends React.Component {
5-
shouldComponentUpdate() {
6-
return PureRenderMixin.shouldComponentUpdate.apply(this, arguments);
5+
shouldComponentUpdate(theArgs) {
6+
return PureRenderMixin.shouldComponentUpdate.apply(this, ...theArgs);
77
}
88
}

0 commit comments

Comments
 (0)