Browse Source

Version bumps for ruby and misc gems (#1159)

* Update rspec-rails to version 3.5.2

* Update addressable to version 2.5.1

* Update autoprefixer-rails to version 6.7.7.1

* Update bullet to version 5.5.1

* Update domain_name to version 0.5.20170404

* Update letter_opener_web to version 1.3.1

* Upate redis-rails to version 5.0.2

* Update active_record_query_trace to version 1.5.4

* Update capistrano-rails to version 1.2.3

* Update dotenv-rails to version 2.2.0

* Update pg to version 0.20.0

* Update tilt to version 2.0.7

* Update warden to version 1.2.7

* Update tins to version 1.13.2

* Update terminal-table to version 1.7.3

* Update oj to version 2.18.5

* Update simplecov to version 0.14.1

* Update uglifier to version 3.1.13

* Update hashdiff to version 0.3.2

* Update webmock to version 2.3.2

* Update devise to version 4.2.1

* Use ruby version 2.4.1

* Update sass to version 3.4.23

* Update puma to version 3.8.2

* Update will_paginate to version 3.1.5

* Update font-awesome-rails to version 4.7.0.1

* Update fuubar to version 2.2.0

* Update pry-rails to version 0.3.6

* Update simple-navigation to version 4.0.5

* Update rubocop to version 0.48.1

* Update doorkeeper to version 4.2.5

* Update faker to version 1.7.3

* Update aws-sdk to version 2.9.5

* Update fabrication to version 2.16.1

* Update hamlit-rails to version 0.2.0

* Update http to version 2.2.1

* Update httplog to version 0.99.2

* Update sidekiq to version 4.2.10

* Update rspec-sidekiq to version 3.0.0

* Update pghero to version 1.6.4

* Update rack-cors to version 0.4.1

* Update i18n-tasks to version 0.9.13

* Update ruby-oembed to version 0.12.0

* Update jquery-rails to version 4.3.1

* Update simple_form to version 3.4.0

* Update react-rails to version 1.11.0

* Update aws-sdk to version 2.9.6

* Update sidekiq-unique-jobs to version 5.0.0

* Update uglifier to version 3.2.0
Matt Jankowski 1 year ago
parent
commit
64dbde0dbf
7 changed files with 99 additions and 107 deletions
  1. 1
    1
      .ruby-version
  2. 1
    1
      .travis.yml
  3. 1
    1
      Dockerfile
  4. 1
    1
      Gemfile
  5. 89
    99
      Gemfile.lock
  6. 5
    3
      config/initializers/httplog.rb
  7. 1
    1
      docs/Running-Mastodon/Production-guide.md

+ 1
- 1
.ruby-version View File

@@ -1 +1 @@
1
-2.3.1
1
+2.4.1

+ 1
- 1
.travis.yml View File

@@ -16,7 +16,7 @@ addons:
16 16
   postgresql: 9.4
17 17
 
18 18
 rvm:
19
-  - 2.3.1
19
+  - 2.4.1
20 20
 
21 21
 services:
22 22
   - redis-server

+ 1
- 1
Dockerfile View File

@@ -1,4 +1,4 @@
1
-FROM ruby:2.3.1-alpine
1
+FROM ruby:2.4.1-alpine
2 2
 
3 3
 LABEL maintainer="https://github.com/tootsuite/mastodon" \
4 4
       description="A GNU Social-compatible microblogging server"

+ 1
- 1
Gemfile View File

@@ -1,7 +1,7 @@
1 1
 # frozen_string_literal: true
2 2
 
3 3
 source 'https://rubygems.org'
4
-ruby '2.3.1'
4
+ruby '2.4.1'
5 5
 
6 6
 gem 'rails', '~> 5.0.2'
7 7
 gem 'sass-rails', '~> 5.0'

+ 89
- 99
Gemfile.lock View File

@@ -24,7 +24,7 @@ GEM
24 24
       erubis (~> 2.7.0)
25 25
       rails-dom-testing (~> 2.0)
26 26
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
27
-    active_record_query_trace (1.5.3)
27
+    active_record_query_trace (1.5.4)
28 28
     activejob (5.0.2)
29 29
       activesupport (= 5.0.2)
30 30
       globalid (>= 0.3.6)
@@ -39,7 +39,7 @@ GEM
39 39
       i18n (~> 0.7)
40 40
       minitest (~> 5.1)
41 41
       tzinfo (~> 1.1)
42
-    addressable (2.5.0)
42
+    addressable (2.5.1)
43 43
       public_suffix (~> 2.0, >= 2.0.2)
44 44
     airbrussh (1.1.2)
45 45
       sshkit (>= 1.6.1, != 1.7.0)
@@ -47,17 +47,17 @@ GEM
47 47
     ast (2.3.0)
48 48
     attr_encrypted (3.0.3)
49 49
       encryptor (~> 3.0.0)
50
-    autoprefixer-rails (6.5.0.2)
50
+    autoprefixer-rails (6.7.7.1)
51 51
       execjs
52 52
     av (0.9.0)
53 53
       cocaine (~> 0.5.3)
54
-    aws-sdk (2.6.28)
55
-      aws-sdk-resources (= 2.6.28)
56
-    aws-sdk-core (2.6.28)
54
+    aws-sdk (2.9.6)
55
+      aws-sdk-resources (= 2.9.6)
56
+    aws-sdk-core (2.9.6)
57 57
       aws-sigv4 (~> 1.0)
58 58
       jmespath (~> 1.0)
59
-    aws-sdk-resources (2.6.28)
60
-      aws-sdk-core (= 2.6.28)
59
+    aws-sdk-resources (2.9.6)
60
+      aws-sdk-core (= 2.9.6)
61 61
     aws-sigv4 (1.0.0)
62 62
     babel-source (5.8.35)
63 63
     babel-transpiler (0.7.0)
@@ -78,12 +78,11 @@ GEM
78 78
       railties (>= 4.0.0, < 5.1)
79 79
       sprockets (>= 3.6.0)
80 80
     builder (3.2.3)
81
-    bullet (5.3.0)
81
+    bullet (5.5.1)
82 82
       activesupport (>= 3.0.0)
83 83
       uniform_notifier (~> 1.10.0)
84
-    capistrano (3.7.2)
84
+    capistrano (3.8.0)
85 85
       airbrussh (>= 1.0.0)
86
-      capistrano-harrow
87 86
       i18n
88 87
       rake (>= 10.0.0)
89 88
       sshkit (>= 1.9.0)
@@ -92,8 +91,7 @@ GEM
92 91
       sshkit (~> 1.2)
93 92
     capistrano-faster-assets (1.0.2)
94 93
       capistrano (>= 3.1)
95
-    capistrano-harrow (0.5.3)
96
-    capistrano-rails (1.2.2)
94
+    capistrano-rails (1.2.3)
97 95
       capistrano (~> 3.1)
98 96
       capistrano-bundler (~> 1.1)
99 97
     capistrano-rbenv (2.1.0)
@@ -119,7 +117,7 @@ GEM
119 117
     crack (0.4.3)
120 118
       safe_yaml (~> 1.0.0)
121 119
     debug_inspector (0.0.2)
122
-    devise (4.2.0)
120
+    devise (4.2.1)
123 121
       bcrypt (~> 3.0)
124 122
       orm_adapter (~> 0.1)
125 123
       railties (>= 4.1.0, < 5.1)
@@ -131,16 +129,16 @@ GEM
131 129
       devise (~> 4.0)
132 130
       railties
133 131
       rotp (~> 2.0)
134
-    diff-lcs (1.2.5)
132
+    diff-lcs (1.3)
135 133
     docile (1.1.5)
136
-    domain_name (0.5.20161129)
134
+    domain_name (0.5.20170404)
137 135
       unf (>= 0.0.5, < 1.0.0)
138
-    doorkeeper (4.2.0)
136
+    doorkeeper (4.2.5)
139 137
       railties (>= 4.2)
140
-    dotenv (2.1.1)
141
-    dotenv-rails (2.1.1)
142
-      dotenv (= 2.1.1)
143
-      railties (>= 4.0, < 5.1)
138
+    dotenv (2.2.0)
139
+    dotenv-rails (2.2.0)
140
+      dotenv (= 2.2.0)
141
+      railties (>= 3.2, < 5.1)
144 142
     easy_translate (0.5.0)
145 143
       json
146 144
       thread
@@ -148,14 +146,14 @@ GEM
148 146
     encryptor (3.0.0)
149 147
     erubis (2.7.0)
150 148
     execjs (2.7.0)
151
-    fabrication (2.15.2)
152
-    faker (1.6.6)
149
+    fabrication (2.16.1)
150
+    faker (1.7.3)
153 151
       i18n (~> 0.5)
154 152
     fast_blank (1.0.0)
155
-    font-awesome-rails (4.6.3.1)
153
+    font-awesome-rails (4.7.0.1)
156 154
       railties (>= 3.2, < 5.1)
157
-    fuubar (2.1.1)
158
-      rspec (~> 3.0)
155
+    fuubar (2.2.0)
156
+      rspec-core (~> 3.0)
159 157
       ruby-progressbar (~> 1.4)
160 158
     globalid (0.3.7)
161 159
       activesupport (>= 4.1.0)
@@ -163,20 +161,20 @@ GEM
163 161
       addressable (~> 2.4)
164 162
       http (~> 2.0)
165 163
       nokogiri (~> 1.6)
166
-    hamlit (2.7.2)
167
-      temple (~> 0.7.6)
164
+    hamlit (2.8.1)
165
+      temple (>= 0.8.0)
168 166
       thor
169 167
       tilt
170
-    hamlit-rails (0.1.0)
168
+    hamlit-rails (0.2.0)
171 169
       actionpack (>= 4.0.1)
172 170
       activesupport (>= 4.0.1)
173 171
       hamlit (>= 1.2.0)
174 172
       railties (>= 4.0.1)
175
-    hashdiff (0.3.0)
173
+    hashdiff (0.3.2)
176 174
     highline (1.7.8)
177 175
     hiredis (0.6.1)
178 176
     htmlentities (4.3.4)
179
-    http (2.1.0)
177
+    http (2.2.1)
180 178
       addressable (~> 2.3)
181 179
       http-cookie (~> 1.0)
182 180
       http-form_data (~> 1.0.1)
@@ -186,10 +184,10 @@ GEM
186 184
     http-form_data (1.0.1)
187 185
     http_accept_language (2.1.0)
188 186
     http_parser.rb (0.6.0)
189
-    httplog (0.3.2)
187
+    httplog (0.99.2)
190 188
       colorize
191 189
     i18n (0.8.1)
192
-    i18n-tasks (0.9.6)
190
+    i18n-tasks (0.9.13)
193 191
       activesupport (>= 4.0.2)
194 192
       ast (>= 2.1.0)
195 193
       easy_translate (>= 0.5.0)
@@ -197,19 +195,19 @@ GEM
197 195
       highline (>= 1.7.3)
198 196
       i18n
199 197
       parser (>= 2.2.3.0)
200
-      term-ansicolor (>= 1.3.2)
198
+      rainbow (~> 2.2)
201 199
       terminal-table (>= 1.5.1)
202 200
     jmespath (1.3.1)
203
-    jquery-rails (4.1.1)
201
+    jquery-rails (4.3.1)
204 202
       rails-dom-testing (>= 1, < 3)
205 203
       railties (>= 4.2.0)
206 204
       thor (>= 0.14, < 2.0)
207
-    json (1.8.3)
205
+    json (2.0.3)
208 206
     launchy (2.4.3)
209 207
       addressable (~> 2.3)
210 208
     letter_opener (1.4.1)
211 209
       launchy (~> 2.2)
212
-    letter_opener_web (1.3.0)
210
+    letter_opener_web (1.3.1)
213 211
       actionmailer (>= 3.2)
214 212
       letter_opener (~> 1.0)
215 213
       railties (>= 3.2)
@@ -231,11 +229,11 @@ GEM
231 229
     minitest (5.10.1)
232 230
     net-scp (1.2.1)
233 231
       net-ssh (>= 2.6.5)
234
-    net-ssh (4.0.1)
232
+    net-ssh (4.1.0)
235 233
     nio4r (2.0.0)
236 234
     nokogiri (1.7.1)
237 235
       mini_portile2 (~> 2.1.0)
238
-    oj (2.17.3)
236
+    oj (2.18.5)
239 237
     orm_adapter (0.5.0)
240 238
     ostatus2 (1.0.2)
241 239
       addressable (~> 2.4)
@@ -251,26 +249,26 @@ GEM
251 249
     paperclip-av-transcoder (0.6.4)
252 250
       av (~> 0.9.0)
253 251
       paperclip (>= 2.5.2)
254
-    parser (2.3.1.2)
252
+    parser (2.4.0.0)
255 253
       ast (~> 2.2)
256
-    pg (0.18.4)
257
-    pghero (1.6.2)
254
+    pg (0.20.0)
255
+    pghero (1.6.4)
258 256
       activerecord
259 257
     powerpack (0.1.1)
260 258
     pry (0.10.4)
261 259
       coderay (~> 1.1.0)
262 260
       method_source (~> 0.8.1)
263 261
       slop (~> 3.4)
264
-    pry-rails (0.3.4)
265
-      pry (>= 0.9.10)
266
-    public_suffix (2.0.4)
267
-    puma (3.6.0)
262
+    pry-rails (0.3.6)
263
+      pry (>= 0.10.4)
264
+    public_suffix (2.0.5)
265
+    puma (3.8.2)
268 266
     rabl (0.13.1)
269 267
       activesupport (>= 2.3.14)
270 268
     rack (2.0.1)
271 269
     rack-attack (5.0.1)
272 270
       rack
273
-    rack-cors (0.4.0)
271
+    rack-cors (0.4.1)
274 272
     rack-protection (1.5.3)
275 273
       rack
276 274
     rack-test (0.6.3)
@@ -306,42 +304,37 @@ GEM
306 304
       method_source
307 305
       rake (>= 0.8.7)
308 306
       thor (>= 0.18.1, < 2.0)
309
-    rainbow (2.1.0)
307
+    rainbow (2.2.1)
310 308
     rake (12.0.0)
311
-    react-rails (1.10.0)
309
+    react-rails (1.11.0)
312 310
       babel-transpiler (>= 0.7.0)
313
-      coffee-script-source (~> 1.8)
314 311
       connection_pool
315 312
       execjs
316 313
       railties (>= 3.2)
317 314
       tilt
318
-    redis (3.3.2)
319
-    redis-actionpack (5.0.0)
320
-      actionpack (>= 4.0.0, < 6)
321
-      redis-rack (~> 2.0.0.pre)
322
-      redis-store (~> 1.2.0.pre)
323
-    redis-activesupport (5.0.1)
315
+    redis (3.3.3)
316
+    redis-actionpack (5.0.1)
317
+      actionpack (>= 4.0, < 6)
318
+      redis-rack (>= 1, < 3)
319
+      redis-store (>= 1.1.0, < 1.4.0)
320
+    redis-activesupport (5.0.2)
324 321
       activesupport (>= 3, < 6)
325
-      redis-store (~> 1.2.0)
326
-    redis-rack (2.0.0)
327
-      rack (~> 2.0)
328
-      redis-store (~> 1.2.0)
329
-    redis-rails (5.0.1)
330
-      redis-actionpack (~> 5.0.0)
331
-      redis-activesupport (~> 5.0.0)
332
-      redis-store (~> 1.2.0)
333
-    redis-store (1.2.0)
322
+      redis-store (~> 1.3.0)
323
+    redis-rack (2.0.1)
324
+      rack (>= 2.0, < 3)
325
+      redis-store (>= 1.2, < 1.4)
326
+    redis-rails (5.0.2)
327
+      redis-actionpack (>= 5.0, < 6)
328
+      redis-activesupport (>= 5.0, < 6)
329
+      redis-store (>= 1.2, < 2)
330
+    redis-store (1.3.0)
334 331
       redis (>= 2.2)
335 332
     responders (2.3.0)
336 333
       railties (>= 4.2.0, < 5.1)
337 334
     rotp (2.1.2)
338 335
     rqrcode (0.10.1)
339 336
       chunky_png (~> 1.0)
340
-    rspec (3.5.0)
341
-      rspec-core (~> 3.5.0)
342
-      rspec-expectations (~> 3.5.0)
343
-      rspec-mocks (~> 3.5.0)
344
-    rspec-core (3.5.2)
337
+    rspec-core (3.5.4)
345 338
       rspec-support (~> 3.5.0)
346 339
     rspec-expectations (3.5.0)
347 340
       diff-lcs (>= 1.2.0, < 2.0)
@@ -349,7 +342,7 @@ GEM
349 342
     rspec-mocks (3.5.0)
350 343
       diff-lcs (>= 1.2.0, < 2.0)
351 344
       rspec-support (~> 3.5.0)
352
-    rspec-rails (3.5.1)
345
+    rspec-rails (3.5.2)
353 346
       actionpack (>= 3.0)
354 347
       activesupport (>= 3.0)
355 348
       railties (>= 3.0)
@@ -357,40 +350,40 @@ GEM
357 350
       rspec-expectations (~> 3.5.0)
358 351
       rspec-mocks (~> 3.5.0)
359 352
       rspec-support (~> 3.5.0)
360
-    rspec-sidekiq (2.2.0)
361
-      rspec (~> 3.0, >= 3.0.0)
353
+    rspec-sidekiq (3.0.0)
354
+      rspec-core (~> 3.0, >= 3.0.0)
362 355
       sidekiq (>= 2.4.0)
363 356
     rspec-support (3.5.0)
364
-    rubocop (0.42.0)
365
-      parser (>= 2.3.1.1, < 3.0)
357
+    rubocop (0.48.1)
358
+      parser (>= 2.3.3.1, < 3.0)
366 359
       powerpack (~> 0.1)
367 360
       rainbow (>= 1.99.1, < 3.0)
368 361
       ruby-progressbar (~> 1.7)
369 362
       unicode-display_width (~> 1.0, >= 1.0.1)
370
-    ruby-oembed (0.10.1)
363
+    ruby-oembed (0.12.0)
371 364
     ruby-progressbar (1.8.1)
372 365
     safe_yaml (1.0.4)
373
-    sass (3.4.22)
366
+    sass (3.4.23)
374 367
     sass-rails (5.0.6)
375 368
       railties (>= 4.0.0, < 6)
376 369
       sass (~> 3.1)
377 370
       sprockets (>= 2.8, < 4.0)
378 371
       sprockets-rails (>= 2.0, < 4.0)
379 372
       tilt (>= 1.1, < 3)
380
-    sidekiq (4.2.7)
373
+    sidekiq (4.2.10)
381 374
       concurrent-ruby (~> 1.0)
382 375
       connection_pool (~> 2.2, >= 2.2.0)
383 376
       rack-protection (>= 1.5.0)
384 377
       redis (~> 3.2, >= 3.2.1)
385
-    sidekiq-unique-jobs (4.0.18)
386
-      sidekiq (>= 2.6)
378
+    sidekiq-unique-jobs (5.0.0)
379
+      sidekiq (>= 4.0)
387 380
       thor
388
-    simple-navigation (4.0.3)
381
+    simple-navigation (4.0.5)
389 382
       activesupport (>= 2.3.2)
390
-    simple_form (3.2.1)
383
+    simple_form (3.4.0)
391 384
       actionpack (> 4, < 5.1)
392 385
       activemodel (> 4, < 5.1)
393
-    simplecov (0.12.0)
386
+    simplecov (0.14.1)
394 387
       docile (~> 1.1.0)
395 388
       json (>= 1.8, < 3)
396 389
       simplecov-html (~> 0.10.0)
@@ -403,43 +396,40 @@ GEM
403 396
       actionpack (>= 4.0)
404 397
       activesupport (>= 4.0)
405 398
       sprockets (>= 3.0.0)
406
-    sshkit (1.11.5)
399
+    sshkit (1.13.1)
407 400
       net-scp (>= 1.1.2)
408 401
       net-ssh (>= 2.8.0)
409 402
     statsd-instrument (2.1.2)
410
-    temple (0.7.7)
411
-    term-ansicolor (1.4.0)
412
-      tins (~> 1.0)
413
-    terminal-table (1.7.0)
414
-      unicode-display_width (~> 1.1)
403
+    temple (0.8.0)
404
+    terminal-table (1.7.3)
405
+      unicode-display_width (~> 1.1.1)
415 406
     thor (0.19.4)
416 407
     thread (0.2.2)
417 408
     thread_safe (0.3.6)
418
-    tilt (2.0.6)
419
-    tins (1.12.0)
409
+    tilt (2.0.7)
420 410
     twitter-text (1.14.5)
421 411
       unf (~> 0.1.0)
422
-    tzinfo (1.2.2)
412
+    tzinfo (1.2.3)
423 413
       thread_safe (~> 0.1)
424 414
     tzinfo-data (1.2017.2)
425 415
       tzinfo (>= 1.0.0)
426
-    uglifier (3.0.1)
416
+    uglifier (3.2.0)
427 417
       execjs (>= 0.3.0, < 3)
428 418
     unf (0.1.4)
429 419
       unf_ext
430 420
     unf_ext (0.0.7.2)
431
-    unicode-display_width (1.1.0)
421
+    unicode-display_width (1.1.3)
432 422
     uniform_notifier (1.10.0)
433
-    warden (1.2.6)
423
+    warden (1.2.7)
434 424
       rack (>= 1.0)
435
-    webmock (2.1.0)
425
+    webmock (2.3.2)
436 426
       addressable (>= 2.3.6)
437 427
       crack (>= 0.3.2)
438 428
       hashdiff
439 429
     websocket-driver (0.6.5)
440 430
       websocket-extensions (>= 0.1.0)
441 431
     websocket-extensions (0.1.2)
442
-    will_paginate (3.1.0)
432
+    will_paginate (3.1.5)
443 433
 
444 434
 PLATFORMS
445 435
   ruby
@@ -521,7 +511,7 @@ DEPENDENCIES
521 511
   will_paginate
522 512
 
523 513
 RUBY VERSION
524
-   ruby 2.3.1p112
514
+   ruby 2.4.1p111
525 515
 
526 516
 BUNDLED WITH
527
-   1.14.5
517
+   1.14.6

+ 5
- 3
config/initializers/httplog.rb View File

@@ -1,3 +1,5 @@
1
-HttpLog.options[:logger] = Rails.logger
2
-HttpLog.options[:color]  = { color: :yellow }
3
-HttpLog.options[:compact_log] = true
1
+HttpLog.configure do |config|
2
+  config.logger = Rails.logger
3
+  config.color = { color: :yellow }
4
+  config.compact_log = true
5
+end

+ 1
- 1
docs/Running-Mastodon/Production-guide.md View File

@@ -121,7 +121,7 @@ It is recommended to use rbenv (exclusively from the `mastodon` user) to install
121 121
 [2]: https://github.com/rbenv/ruby-build#installation
122 122
 [3]: https://github.com/rbenv/ruby-build/wiki#suggested-build-environment
123 123
 
124
-Then once `rbenv` is ready, run `rbenv install 2.3.1` to install the Ruby version for Mastodon.
124
+Then once `rbenv` is ready, run `rbenv install 2.4.1` to install the Ruby version for Mastodon.
125 125
 
126 126
 ## Git
127 127
 

Loading…
Cancel
Save