diff options
| -rw-r--r-- | .ruby-version | 2 | ||||
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 188 | ||||
| -rw-r--r-- | config/initializers/httplog.rb | 8 | ||||
| -rw-r--r-- | docs/Running-Mastodon/Production-guide.md | 2 |
7 files changed, 99 insertions, 107 deletions
diff --git a/.ruby-version b/.ruby-version index 2bf1c1ccf..005119baa 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.3.1 +2.4.1 diff --git a/.travis.yml b/.travis.yml index b1b0c2bcd..a9824ccf7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ addons: postgresql: 9.4 rvm: - - 2.3.1 + - 2.4.1 services: - redis-server diff --git a/Dockerfile b/Dockerfile index 57a8f34e9..a05525b33 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.3.1-alpine +FROM ruby:2.4.1-alpine LABEL maintainer="https://github.com/tootsuite/mastodon" \ description="A GNU Social-compatible microblogging server" diff --git a/Gemfile b/Gemfile index 7895a345c..8810c83de 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ # frozen_string_literal: true source 'https://rubygems.org' -ruby '2.3.1' +ruby '2.4.1' gem 'rails', '~> 5.0.2' gem 'sass-rails', '~> 5.0' diff --git a/Gemfile.lock b/Gemfile.lock index aa048aace..6e3865527 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -24,7 +24,7 @@ GEM erubis (~> 2.7.0) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - active_record_query_trace (1.5.3) + active_record_query_trace (1.5.4) activejob (5.0.2) activesupport (= 5.0.2) globalid (>= 0.3.6) @@ -39,7 +39,7 @@ GEM i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.5.0) + addressable (2.5.1) public_suffix (~> 2.0, >= 2.0.2) airbrussh (1.1.2) sshkit (>= 1.6.1, != 1.7.0) @@ -47,17 +47,17 @@ GEM ast (2.3.0) attr_encrypted (3.0.3) encryptor (~> 3.0.0) - autoprefixer-rails (6.5.0.2) + autoprefixer-rails (6.7.7.1) execjs av (0.9.0) cocaine (~> 0.5.3) - aws-sdk (2.6.28) - aws-sdk-resources (= 2.6.28) - aws-sdk-core (2.6.28) + aws-sdk (2.9.6) + aws-sdk-resources (= 2.9.6) + aws-sdk-core (2.9.6) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.6.28) - aws-sdk-core (= 2.6.28) + aws-sdk-resources (2.9.6) + aws-sdk-core (= 2.9.6) aws-sigv4 (1.0.0) babel-source (5.8.35) babel-transpiler (0.7.0) @@ -78,12 +78,11 @@ GEM railties (>= 4.0.0, < 5.1) sprockets (>= 3.6.0) builder (3.2.3) - bullet (5.3.0) + bullet (5.5.1) activesupport (>= 3.0.0) uniform_notifier (~> 1.10.0) - capistrano (3.7.2) + capistrano (3.8.0) airbrussh (>= 1.0.0) - capistrano-harrow i18n rake (>= 10.0.0) sshkit (>= 1.9.0) @@ -92,8 +91,7 @@ GEM sshkit (~> 1.2) capistrano-faster-assets (1.0.2) capistrano (>= 3.1) - capistrano-harrow (0.5.3) - capistrano-rails (1.2.2) + capistrano-rails (1.2.3) capistrano (~> 3.1) capistrano-bundler (~> 1.1) capistrano-rbenv (2.1.0) @@ -119,7 +117,7 @@ GEM crack (0.4.3) safe_yaml (~> 1.0.0) debug_inspector (0.0.2) - devise (4.2.0) + devise (4.2.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 5.1) @@ -131,16 +129,16 @@ GEM devise (~> 4.0) railties rotp (~> 2.0) - diff-lcs (1.2.5) + diff-lcs (1.3) docile (1.1.5) - domain_name (0.5.20161129) + domain_name (0.5.20170404) unf (>= 0.0.5, < 1.0.0) - doorkeeper (4.2.0) + doorkeeper (4.2.5) railties (>= 4.2) - dotenv (2.1.1) - dotenv-rails (2.1.1) - dotenv (= 2.1.1) - railties (>= 4.0, < 5.1) + dotenv (2.2.0) + dotenv-rails (2.2.0) + dotenv (= 2.2.0) + railties (>= 3.2, < 5.1) easy_translate (0.5.0) json thread @@ -148,14 +146,14 @@ GEM encryptor (3.0.0) erubis (2.7.0) execjs (2.7.0) - fabrication (2.15.2) - faker (1.6.6) + fabrication (2.16.1) + faker (1.7.3) i18n (~> 0.5) fast_blank (1.0.0) - font-awesome-rails (4.6.3.1) + font-awesome-rails (4.7.0.1) railties (>= 3.2, < 5.1) - fuubar (2.1.1) - rspec (~> 3.0) + fuubar (2.2.0) + rspec-core (~> 3.0) ruby-progressbar (~> 1.4) globalid (0.3.7) activesupport (>= 4.1.0) @@ -163,20 +161,20 @@ GEM addressable (~> 2.4) http (~> 2.0) nokogiri (~> 1.6) - hamlit (2.7.2) - temple (~> 0.7.6) + hamlit (2.8.1) + temple (>= 0.8.0) thor tilt - hamlit-rails (0.1.0) + hamlit-rails (0.2.0) actionpack (>= 4.0.1) activesupport (>= 4.0.1) hamlit (>= 1.2.0) railties (>= 4.0.1) - hashdiff (0.3.0) + hashdiff (0.3.2) highline (1.7.8) hiredis (0.6.1) htmlentities (4.3.4) - http (2.1.0) + http (2.2.1) addressable (~> 2.3) http-cookie (~> 1.0) http-form_data (~> 1.0.1) @@ -186,10 +184,10 @@ GEM http-form_data (1.0.1) http_accept_language (2.1.0) http_parser.rb (0.6.0) - httplog (0.3.2) + httplog (0.99.2) colorize i18n (0.8.1) - i18n-tasks (0.9.6) + i18n-tasks (0.9.13) activesupport (>= 4.0.2) ast (>= 2.1.0) easy_translate (>= 0.5.0) @@ -197,19 +195,19 @@ GEM highline (>= 1.7.3) i18n parser (>= 2.2.3.0) - term-ansicolor (>= 1.3.2) + rainbow (~> 2.2) terminal-table (>= 1.5.1) jmespath (1.3.1) - jquery-rails (4.1.1) + jquery-rails (4.3.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (1.8.3) + json (2.0.3) launchy (2.4.3) addressable (~> 2.3) letter_opener (1.4.1) launchy (~> 2.2) - letter_opener_web (1.3.0) + letter_opener_web (1.3.1) actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) @@ -231,11 +229,11 @@ GEM minitest (5.10.1) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (4.0.1) + net-ssh (4.1.0) nio4r (2.0.0) nokogiri (1.7.1) mini_portile2 (~> 2.1.0) - oj (2.17.3) + oj (2.18.5) orm_adapter (0.5.0) ostatus2 (1.0.2) addressable (~> 2.4) @@ -251,26 +249,26 @@ GEM paperclip-av-transcoder (0.6.4) av (~> 0.9.0) paperclip (>= 2.5.2) - parser (2.3.1.2) + parser (2.4.0.0) ast (~> 2.2) - pg (0.18.4) - pghero (1.6.2) + pg (0.20.0) + pghero (1.6.4) activerecord powerpack (0.1.1) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - pry-rails (0.3.4) - pry (>= 0.9.10) - public_suffix (2.0.4) - puma (3.6.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + public_suffix (2.0.5) + puma (3.8.2) rabl (0.13.1) activesupport (>= 2.3.14) rack (2.0.1) rack-attack (5.0.1) rack - rack-cors (0.4.0) + rack-cors (0.4.1) rack-protection (1.5.3) rack rack-test (0.6.3) @@ -306,42 +304,37 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.1.0) + rainbow (2.2.1) rake (12.0.0) - react-rails (1.10.0) + react-rails (1.11.0) babel-transpiler (>= 0.7.0) - coffee-script-source (~> 1.8) connection_pool execjs railties (>= 3.2) tilt - redis (3.3.2) - redis-actionpack (5.0.0) - actionpack (>= 4.0.0, < 6) - redis-rack (~> 2.0.0.pre) - redis-store (~> 1.2.0.pre) - redis-activesupport (5.0.1) + redis (3.3.3) + redis-actionpack (5.0.1) + actionpack (>= 4.0, < 6) + redis-rack (>= 1, < 3) + redis-store (>= 1.1.0, < 1.4.0) + redis-activesupport (5.0.2) activesupport (>= 3, < 6) - redis-store (~> 1.2.0) - redis-rack (2.0.0) - rack (~> 2.0) - redis-store (~> 1.2.0) - redis-rails (5.0.1) - redis-actionpack (~> 5.0.0) - redis-activesupport (~> 5.0.0) - redis-store (~> 1.2.0) - redis-store (1.2.0) + redis-store (~> 1.3.0) + redis-rack (2.0.1) + rack (>= 2.0, < 3) + redis-store (>= 1.2, < 1.4) + redis-rails (5.0.2) + redis-actionpack (>= 5.0, < 6) + redis-activesupport (>= 5.0, < 6) + redis-store (>= 1.2, < 2) + redis-store (1.3.0) redis (>= 2.2) responders (2.3.0) railties (>= 4.2.0, < 5.1) rotp (2.1.2) rqrcode (0.10.1) chunky_png (~> 1.0) - rspec (3.5.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-core (3.5.2) + rspec-core (3.5.4) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) @@ -349,7 +342,7 @@ GEM rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.5.0) - rspec-rails (3.5.1) + rspec-rails (3.5.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) @@ -357,40 +350,40 @@ GEM rspec-expectations (~> 3.5.0) rspec-mocks (~> 3.5.0) rspec-support (~> 3.5.0) - rspec-sidekiq (2.2.0) - rspec (~> 3.0, >= 3.0.0) + rspec-sidekiq (3.0.0) + rspec-core (~> 3.0, >= 3.0.0) sidekiq (>= 2.4.0) rspec-support (3.5.0) - rubocop (0.42.0) - parser (>= 2.3.1.1, < 3.0) + rubocop (0.48.1) + parser (>= 2.3.3.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - ruby-oembed (0.10.1) + ruby-oembed (0.12.0) ruby-progressbar (1.8.1) safe_yaml (1.0.4) - sass (3.4.22) + sass (3.4.23) sass-rails (5.0.6) railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sidekiq (4.2.7) + sidekiq (4.2.10) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) rack-protection (>= 1.5.0) redis (~> 3.2, >= 3.2.1) - sidekiq-unique-jobs (4.0.18) - sidekiq (>= 2.6) + sidekiq-unique-jobs (5.0.0) + sidekiq (>= 4.0) thor - simple-navigation (4.0.3) + simple-navigation (4.0.5) activesupport (>= 2.3.2) - simple_form (3.2.1) + simple_form (3.4.0) actionpack (> 4, < 5.1) activemodel (> 4, < 5.1) - simplecov (0.12.0) + simplecov (0.14.1) docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) @@ -403,43 +396,40 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sshkit (1.11.5) + sshkit (1.13.1) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) statsd-instrument (2.1.2) - temple (0.7.7) - term-ansicolor (1.4.0) - tins (~> 1.0) - terminal-table (1.7.0) - unicode-display_width (~> 1.1) + temple (0.8.0) + terminal-table (1.7.3) + unicode-display_width (~> 1.1.1) thor (0.19.4) thread (0.2.2) thread_safe (0.3.6) - tilt (2.0.6) - tins (1.12.0) + tilt (2.0.7) twitter-text (1.14.5) unf (~> 0.1.0) - tzinfo (1.2.2) + tzinfo (1.2.3) thread_safe (~> 0.1) tzinfo-data (1.2017.2) tzinfo (>= 1.0.0) - uglifier (3.0.1) + uglifier (3.2.0) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext unf_ext (0.0.7.2) - unicode-display_width (1.1.0) + unicode-display_width (1.1.3) uniform_notifier (1.10.0) - warden (1.2.6) + warden (1.2.7) rack (>= 1.0) - webmock (2.1.0) + webmock (2.3.2) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) - will_paginate (3.1.0) + will_paginate (3.1.5) PLATFORMS ruby @@ -521,7 +511,7 @@ DEPENDENCIES will_paginate RUBY VERSION - ruby 2.3.1p112 + ruby 2.4.1p111 BUNDLED WITH - 1.14.5 + 1.14.6 diff --git a/config/initializers/httplog.rb b/config/initializers/httplog.rb index 37f113d5d..5cfc16a8b 100644 --- a/config/initializers/httplog.rb +++ b/config/initializers/httplog.rb @@ -1,3 +1,5 @@ -HttpLog.options[:logger] = Rails.logger -HttpLog.options[:color] = { color: :yellow } -HttpLog.options[:compact_log] = true +HttpLog.configure do |config| + config.logger = Rails.logger + config.color = { color: :yellow } + config.compact_log = true +end diff --git a/docs/Running-Mastodon/Production-guide.md b/docs/Running-Mastodon/Production-guide.md index 785826aca..ec67a452c 100644 --- a/docs/Running-Mastodon/Production-guide.md +++ b/docs/Running-Mastodon/Production-guide.md @@ -121,7 +121,7 @@ It is recommended to use rbenv (exclusively from the `mastodon` user) to install [2]: https://github.com/rbenv/ruby-build#installation [3]: https://github.com/rbenv/ruby-build/wiki#suggested-build-environment -Then once `rbenv` is ready, run `rbenv install 2.3.1` to install the Ruby version for Mastodon. +Then once `rbenv` is ready, run `rbenv install 2.4.1` to install the Ruby version for Mastodon. ## Git |