From e326b0dda1cd9b85519c185fbed624ad0eb4d91d Mon Sep 17 00:00:00 2001 From: Shlee Date: Fri, 10 Jan 2020 12:34:25 +0800 Subject: Upgrade CircleCI testing to Ruby 2.4-2.7 (#12800) * Update config.yml * Update Gemfile --- Gemfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 263b24ab1..c16ff8e2f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ # frozen_string_literal: true source 'https://rubygems.org' -ruby '>= 2.4.0', '< 2.7.0' +ruby '>= 2.4.0', '< 3.0.0' gem 'pkg-config', '~> 1.4' @@ -10,6 +10,9 @@ gem 'rails', '~> 5.2.4' gem 'sprockets', '~> 3.7.2' gem 'thor', '~> 0.20' +gem 'thwait', '~> 0.1.0' +gem 'e2mmap', '~> 0.1.0' + gem 'hamlit-rails', '~> 0.2' gem 'pg', '~> 1.2' gem 'makara', '~> 0.4' -- cgit From d1f68fb5898b5720d410cf2e588bea5374129cf2 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 11 Jan 2020 07:02:16 +0900 Subject: Bump rdf-normalize from 0.3.3 to 0.4.0 (#12785) Bumps [rdf-normalize](https://github.com/gkellogg/rdf-normalize) from 0.3.3 to 0.4.0. - [Release notes](https://github.com/gkellogg/rdf-normalize/releases) - [Commits](https://github.com/gkellogg/rdf-normalize/compare/0.3.3...0.4.0) Signed-off-by: dependabot-preview[bot] --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index c16ff8e2f..e4946115a 100644 --- a/Gemfile +++ b/Gemfile @@ -102,7 +102,7 @@ gem 'webpush' gem 'json-ld', git: 'https://github.com/ruby-rdf/json-ld.git', ref: 'e742697a0906e74e8bb777ef98137bc3955d981d' gem 'json-ld-preloaded', '~> 3.0' -gem 'rdf-normalize', '~> 0.3' +gem 'rdf-normalize', '~> 0.4' group :development, :test do gem 'fabrication', '~> 2.21' diff --git a/Gemfile.lock b/Gemfile.lock index aed327dba..5a881fe87 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -504,11 +504,11 @@ GEM thor (>= 0.19.0, < 2.0) rainbow (3.0.0) rake (13.0.1) - rdf (3.0.13) + rdf (3.1.0) hamster (~> 3.0) link_header (~> 0.0, >= 0.0.8) - rdf-normalize (0.3.3) - rdf (>= 2.2, < 4.0) + rdf-normalize (0.4.0) + rdf (~> 3.1) redis (4.1.3) redis-actionpack (5.0.2) actionpack (>= 4.0, < 6) @@ -771,7 +771,7 @@ DEPENDENCIES rails-controller-testing (~> 1.0) rails-i18n (~> 5.1) rails-settings-cached (~> 0.6) - rdf-normalize (~> 0.3) + rdf-normalize (~> 0.4) redis (~> 4.1) redis-namespace (~> 1.7) redis-rails (~> 5.0) -- cgit From 2a5dee0f08e431d90368db08dccdf87ef112163f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 11 Jan 2020 19:51:04 +0900 Subject: Bump rqrcode from 0.10.1 to 1.1.2 (#12357) Bumps [rqrcode](https://github.com/whomwah/rqrcode) from 0.10.1 to 1.1.2. - [Release notes](https://github.com/whomwah/rqrcode/releases) - [Commits](https://github.com/whomwah/rqrcode/commits) Signed-off-by: dependabot-preview[bot] --- Gemfile | 2 +- Gemfile.lock | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index e4946115a..2ebea745d 100644 --- a/Gemfile +++ b/Gemfile @@ -81,7 +81,7 @@ gem 'rails-i18n', '~> 5.1' gem 'rails-settings-cached', '~> 0.6' gem 'redis', '~> 4.1', require: ['redis', 'redis/connection/hiredis'] gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock' -gem 'rqrcode', '~> 0.10' +gem 'rqrcode', '~> 1.1' gem 'ruby-progressbar', '~> 1.10' gem 'sanitize', '~> 5.1' gem 'sidekiq', '~> 5.2' diff --git a/Gemfile.lock b/Gemfile.lock index 5a881fe87..b70c59ad5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -173,7 +173,7 @@ GEM activesupport (>= 4.0) elasticsearch (>= 2.0.0) elasticsearch-dsl - chunky_png (1.3.10) + chunky_png (1.3.11) cld3 (3.2.6) ffi (>= 1.1.0, < 1.12.0) climate_control (0.2.0) @@ -536,8 +536,10 @@ GEM railties (>= 5.0) rotp (2.1.2) rpam2 (4.0.2) - rqrcode (0.10.1) + rqrcode (1.1.2) chunky_png (~> 1.0) + rqrcode_core (~> 0.1) + rqrcode_core (0.1.1) rspec-core (3.9.0) rspec-support (~> 3.9.0) rspec-expectations (3.9.0) @@ -775,7 +777,7 @@ DEPENDENCIES redis (~> 4.1) redis-namespace (~> 1.7) redis-rails (~> 5.0) - rqrcode (~> 0.10) + rqrcode (~> 1.1) rspec-rails (~> 3.9) rspec-sidekiq (~> 3.0) rubocop (~> 0.78) -- cgit From 57e2833f6a34c78c933b2941305eac8995c115e8 Mon Sep 17 00:00:00 2001 From: ThibG Date: Sat, 11 Jan 2020 21:36:53 +0100 Subject: Remove dependency on OStatus2 gem (#12822) --- Gemfile | 1 - Gemfile.lock | 4 ---- app/models/account.rb | 4 ---- spec/models/account_spec.rb | 7 ------- 4 files changed, 16 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 2ebea745d..f0adf610c 100644 --- a/Gemfile +++ b/Gemfile @@ -68,7 +68,6 @@ gem 'nilsimsa', git: 'https://github.com/witgo/nilsimsa', ref: 'fd184883048b922b gem 'nokogiri', '~> 1.10' gem 'nsa', '~> 0.2' gem 'oj', '~> 3.10' -gem 'ostatus2', '~> 2.0' gem 'ox', '~> 2.11' gem 'parslet' gem 'parallel', '~> 1.19' diff --git a/Gemfile.lock b/Gemfile.lock index b70c59ad5..650d5ef85 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -409,10 +409,6 @@ GEM omniauth (~> 1.3, >= 1.3.2) ruby-saml (~> 1.7) orm_adapter (0.5.0) - ostatus2 (2.0.3) - addressable (~> 2.5) - http (~> 3.0) - nokogiri (~> 1.8) ox (2.11.0) paperclip (6.0.0) activemodel (>= 4.2.0) diff --git a/app/models/account.rb b/app/models/account.rb index feaf273c1..1e8abe6ec 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -314,10 +314,6 @@ class Account < ApplicationRecord self.fields = tmp end - def subscription(webhook_url) - @subscription ||= OStatus2::Subscription.new(remote_url, secret: secret, webhook: webhook_url, hub: hub_url) - end - def save_with_optional_media! save! rescue ActiveRecord::RecordInvalid diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb index 3cca9b343..4266122b2 100644 --- a/spec/models/account_spec.rb +++ b/spec/models/account_spec.rb @@ -215,13 +215,6 @@ RSpec.describe Account, type: :model do end end - describe '#subscription' do - it 'returns an OStatus subscription' do - account = Fabricate(:account) - expect(account.subscription('')).to be_instance_of OStatus2::Subscription - end - end - describe '#object_type' do it 'is always a person' do account = Fabricate(:account) -- cgit From 24cd2126c6cfb80844ef9ffbf61647b3d9afdc68 Mon Sep 17 00:00:00 2001 From: ThibG Date: Sun, 12 Jan 2020 15:49:30 +0100 Subject: Fix Ruby 2.7 support (#12831) - update http gem to avoid errors - update blurhash gem to avoid shared object loading error - update goldfinger gem so the http gem could be updated - update json gem to avoid warnings --- Gemfile | 2 +- Gemfile.lock | 25 +++++++++++++++---------- app/lib/request.rb | 2 +- 3 files changed, 17 insertions(+), 12 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index f0adf610c..316ebb81d 100644 --- a/Gemfile +++ b/Gemfile @@ -56,7 +56,7 @@ gem 'hiredis', '~> 0.6' gem 'redis-namespace', '~> 1.7' gem 'health_check', git: 'https://github.com/ianheggie/health_check', ref: '0b799ead604f900ed50685e9b2d469cd2befba5b' gem 'htmlentities', '~> 4.3' -gem 'http', '~> 3.3' +gem 'http', '~> 4.3' gem 'http_accept_language', '~> 2.1' gem 'http_parser.rb', '~> 0.6', git: 'https://github.com/tmm1/http_parser.rb', ref: '54b17ba8c7d8d20a16dfc65d1775241833219cf2', submodules: true gem 'httplog', '~> 1.3' diff --git a/Gemfile.lock b/Gemfile.lock index a14b6ec93..44682002a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -128,7 +128,7 @@ GEM rack (>= 0.9.0) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - blurhash (0.1.3) + blurhash (0.1.4) ffi (~> 1.10.0) bootsnap (1.4.5) msgpack (~> 1.0) @@ -216,7 +216,7 @@ GEM discard (1.1.0) activerecord (>= 4.2, < 7) docile (1.3.2) - domain_name (0.5.20180417) + domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) doorkeeper (5.2.3) railties (>= 5) @@ -248,6 +248,9 @@ GEM fast_blank (1.0.0) fastimage (2.1.7) ffi (1.10.0) + ffi-compiler (1.0.1) + ffi (>= 1.0.0) + rake fog-core (2.1.0) builder excon (~> 0.58) @@ -271,9 +274,9 @@ GEM ffi (~> 1.0) globalid (0.4.2) activesupport (>= 4.2.0) - goldfinger (2.1.0) + goldfinger (2.1.1) addressable (~> 2.5) - http (~> 3.0) + http (~> 4.0) nokogiri (~> 1.8) oj (~> 3.0) hamlit (2.11.0) @@ -294,14 +297,16 @@ GEM hiredis (0.6.3) hkdf (0.3.0) htmlentities (4.3.4) - http (3.3.0) + http (4.3.0) addressable (~> 2.3) http-cookie (~> 1.0) - http-form_data (~> 2.0) - http_parser.rb (~> 0.6.0) + http-form_data (~> 2.2) + http-parser (~> 1.2.0) http-cookie (1.0.3) domain_name (~> 0.5) - http-form_data (2.1.1) + http-form_data (2.2.0) + http-parser (1.2.1) + ffi-compiler (>= 1.0, < 2.0) http_accept_language (2.1.1) httplog (1.3.3) rack (>= 1.0) @@ -323,7 +328,7 @@ GEM iso-639 (0.2.8) jaro_winkler (1.5.4) jmespath (1.4.0) - json (2.2.0) + json (2.3.0) json-canonicalization (0.1.0) json-ld-preloaded (3.0.6) json-ld (~> 3.0) @@ -722,7 +727,7 @@ DEPENDENCIES health_check! hiredis (~> 0.6) htmlentities (~> 4.3) - http (~> 3.3) + http (~> 4.3) http_accept_language (~> 2.1) http_parser.rb (~> 0.6)! httplog (~> 1.3) diff --git a/app/lib/request.rb b/app/lib/request.rb index d82bbb075..c476e7785 100644 --- a/app/lib/request.rb +++ b/app/lib/request.rb @@ -96,7 +96,7 @@ class Request end def http_client - HTTP.use(:auto_inflate).timeout(:per_operation, TIMEOUT.dup).follow(max_hops: 2) + HTTP.use(:auto_inflate).timeout(TIMEOUT.dup).follow(max_hops: 2) end end -- cgit