From 941e02d0cc130b9401a6d687c6559121fb09b676 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 3 Jul 2022 16:40:28 +0200 Subject: [PATCH 1/3] Allow rails 6 --- Gemfile.lock | 2 +- diaspora_federation-rails.gemspec | 2 +- test/gemfiles/rails4.Gemfile.lock | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8255c4e..9ce9796 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,7 +9,7 @@ PATH valid (~> 1.0) diaspora_federation-json_schema (0.2.7) diaspora_federation-rails (0.2.7) - actionpack (>= 4.2, < 6) + actionpack (>= 4.2, < 7) diaspora_federation (= 0.2.7) diaspora_federation-test (0.2.7) diaspora_federation (= 0.2.7) diff --git a/diaspora_federation-rails.gemspec b/diaspora_federation-rails.gemspec index edc4fba..e4a915a 100644 --- a/diaspora_federation-rails.gemspec +++ b/diaspora_federation-rails.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |s| s.required_ruby_version = "~> 2.1" - s.add_dependency "actionpack", ">= 4.2", "< 6" + s.add_dependency "actionpack", ">= 4.2", "< 7" s.add_dependency "diaspora_federation", DiasporaFederation::VERSION end diff --git a/test/gemfiles/rails4.Gemfile.lock b/test/gemfiles/rails4.Gemfile.lock index d18fd20..81f17e4 100644 --- a/test/gemfiles/rails4.Gemfile.lock +++ b/test/gemfiles/rails4.Gemfile.lock @@ -9,7 +9,7 @@ PATH valid (~> 1.0) diaspora_federation-json_schema (0.2.7) diaspora_federation-rails (0.2.7) - actionpack (>= 4.2, < 6) + actionpack (>= 4.2, < 7) diaspora_federation (= 0.2.7) diaspora_federation-test (0.2.7) diaspora_federation (= 0.2.7) From 12fdf5ca0c592b102b26050aa6fc3930009478d5 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 17 Jul 2022 20:20:28 +0200 Subject: [PATCH 2/3] Also enable MFA requirement on 0.2.x branch --- diaspora_federation-json_schema.gemspec | 3 +++ diaspora_federation-rails.gemspec | 3 +++ diaspora_federation-test.gemspec | 3 +++ diaspora_federation.gemspec | 3 +++ 4 files changed, 12 insertions(+) diff --git a/diaspora_federation-json_schema.gemspec b/diaspora_federation-json_schema.gemspec index d078a28..d7e0427 100644 --- a/diaspora_federation-json_schema.gemspec +++ b/diaspora_federation-json_schema.gemspec @@ -14,6 +14,9 @@ Gem::Specification.new do |s| s.description = "This gem provides JSON schemas (currently one schema) for "\ "validating JSON serialized federation objects." s.license = "AGPL-3.0" + s.metadata = { + "rubygems_mfa_required" => "true" + } s.files = Dir["lib/diaspora_federation/schemas.rb", "lib/diaspora_federation/schemas/*.json"] end diff --git a/diaspora_federation-rails.gemspec b/diaspora_federation-rails.gemspec index e4a915a..370db38 100644 --- a/diaspora_federation-rails.gemspec +++ b/diaspora_federation-rails.gemspec @@ -13,6 +13,9 @@ Gem::Specification.new do |s| s.summary = "diaspora* federation rails engine" s.description = "A rails engine that adds the diaspora* federation protocol to a rails app" s.license = "AGPL-3.0" + s.metadata = { + "rubygems_mfa_required" => "true" + } s.files = Dir["app/**/*", "config/routes.rb", "config/initializers/*", "lib/diaspora_federation/{engine,rails}.rb", "LICENSE", "README.md", "Changelog.md"] diff --git a/diaspora_federation-test.gemspec b/diaspora_federation-test.gemspec index b37a076..7035cbe 100644 --- a/diaspora_federation-test.gemspec +++ b/diaspora_federation-test.gemspec @@ -14,6 +14,9 @@ Gem::Specification.new do |s| s.description = "This gem provides some supplimentary code (factory definitions), that"\ "helps to build tests for users of the diaspora_federation gem." s.license = "AGPL-3.0" + s.metadata = { + "rubygems_mfa_required" => "true" + } s.files = Dir["lib/diaspora_federation/test.rb", "lib/diaspora_federation/test/*"] diff --git a/diaspora_federation.gemspec b/diaspora_federation.gemspec index 489e5cf..49f55e7 100644 --- a/diaspora_federation.gemspec +++ b/diaspora_federation.gemspec @@ -15,6 +15,9 @@ Gem::Specification.new do |s| "de-/encryption of Entities in the protocols used for communication " \ "among the various installations of Diaspora*" s.license = "AGPL-3.0" + s.metadata = { + "rubygems_mfa_required" => "true" + } s.files = Dir["lib/**/*", "LICENSE", "README.md", "Changelog.md"] - Dir["lib/diaspora_federation/{engine,rails,schemas,test}.rb", From c2ae1598d6c4172d3c9cc145c8f49b73dea3ffff Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 17 Jul 2022 20:21:10 +0200 Subject: [PATCH 3/3] Release version 0.2.8 --- Changelog.md | 4 ++++ Gemfile.lock | 12 ++++++------ lib/diaspora_federation/version.rb | 2 +- test/gemfiles/no-rails.Gemfile.lock | 8 ++++---- test/gemfiles/rails4.Gemfile.lock | 12 ++++++------ 5 files changed, 21 insertions(+), 17 deletions(-) diff --git a/Changelog.md b/Changelog.md index 5327e8e..0b16412 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,7 @@ +# 0.2.8 + +* Re-release which allows rails 6 to be used + # 0.2.7 ## Features diff --git a/Gemfile.lock b/Gemfile.lock index 9ce9796..a1911bc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,18 +1,18 @@ PATH remote: . specs: - diaspora_federation (0.2.7) + diaspora_federation (0.2.8) faraday (>= 0.9.0, < 1.0) faraday_middleware (>= 0.10.0, < 1.0) nokogiri (~> 1.6, >= 1.6.8) typhoeus (~> 1.0) valid (~> 1.0) - diaspora_federation-json_schema (0.2.7) - diaspora_federation-rails (0.2.7) + diaspora_federation-json_schema (0.2.8) + diaspora_federation-rails (0.2.8) actionpack (>= 4.2, < 7) - diaspora_federation (= 0.2.7) - diaspora_federation-test (0.2.7) - diaspora_federation (= 0.2.7) + diaspora_federation (= 0.2.8) + diaspora_federation-test (0.2.8) + diaspora_federation (= 0.2.8) fabrication (~> 2.16) uuid (~> 2.3, >= 2.3.8) diff --git a/lib/diaspora_federation/version.rb b/lib/diaspora_federation/version.rb index 2700e7e..d99254b 100644 --- a/lib/diaspora_federation/version.rb +++ b/lib/diaspora_federation/version.rb @@ -1,4 +1,4 @@ module DiasporaFederation # the gem version - VERSION = "0.2.7".freeze + VERSION = "0.2.8".freeze end diff --git a/test/gemfiles/no-rails.Gemfile.lock b/test/gemfiles/no-rails.Gemfile.lock index a7c81a4..7a0088e 100644 --- a/test/gemfiles/no-rails.Gemfile.lock +++ b/test/gemfiles/no-rails.Gemfile.lock @@ -1,15 +1,15 @@ PATH remote: ../.. specs: - diaspora_federation (0.2.7) + diaspora_federation (0.2.8) faraday (>= 0.9.0, < 1.0) faraday_middleware (>= 0.10.0, < 1.0) nokogiri (~> 1.6, >= 1.6.8) typhoeus (~> 1.0) valid (~> 1.0) - diaspora_federation-json_schema (0.2.7) - diaspora_federation-test (0.2.7) - diaspora_federation (= 0.2.7) + diaspora_federation-json_schema (0.2.8) + diaspora_federation-test (0.2.8) + diaspora_federation (= 0.2.8) fabrication (~> 2.16) uuid (~> 2.3, >= 2.3.8) diff --git a/test/gemfiles/rails4.Gemfile.lock b/test/gemfiles/rails4.Gemfile.lock index 81f17e4..da09751 100644 --- a/test/gemfiles/rails4.Gemfile.lock +++ b/test/gemfiles/rails4.Gemfile.lock @@ -1,18 +1,18 @@ PATH remote: ../.. specs: - diaspora_federation (0.2.7) + diaspora_federation (0.2.8) faraday (>= 0.9.0, < 1.0) faraday_middleware (>= 0.10.0, < 1.0) nokogiri (~> 1.6, >= 1.6.8) typhoeus (~> 1.0) valid (~> 1.0) - diaspora_federation-json_schema (0.2.7) - diaspora_federation-rails (0.2.7) + diaspora_federation-json_schema (0.2.8) + diaspora_federation-rails (0.2.8) actionpack (>= 4.2, < 7) - diaspora_federation (= 0.2.7) - diaspora_federation-test (0.2.7) - diaspora_federation (= 0.2.7) + diaspora_federation (= 0.2.8) + diaspora_federation-test (0.2.8) + diaspora_federation (= 0.2.8) fabrication (~> 2.16) uuid (~> 2.3, >= 2.3.8)