diff --git a/Gemfile b/Gemfile index f5eb88154c..acf63ea7ad 100644 --- a/Gemfile +++ b/Gemfile @@ -295,9 +295,7 @@ gem 'roar', '~> 1.1.0' gem 'rack-cors', '~> 1.1.1' # Required for contracts -# Not requiring since it needs to be patched before initialization: -# See lib/open_project/patches/disposable.rb -gem 'disposable', '~> 0.6.1', require: false +gem 'disposable', '~> 0.6.2' platforms :mri, :mingw, :x64_mingw do group :postgres do diff --git a/Gemfile.lock b/Gemfile.lock index 3b8a93301e..29749ce1ff 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -169,7 +169,7 @@ PATH remote: modules/two_factor_authentication specs: openproject-two_factor_authentication (1.0.0) - aws-sdk-sns (~> 1.48.0) + aws-sdk-sns (~> 1.49.0) messagebird-rest (~> 1.4.2) rotp (~> 6.1) @@ -283,20 +283,20 @@ GEM awesome_nested_set (3.4.0) activerecord (>= 4.0.0, < 7.0) aws-eventstream (1.2.0) - aws-partitions (1.537.0) + aws-partitions (1.538.0) aws-sdk-core (3.124.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.51.0) + aws-sdk-kms (1.52.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.107.0) + aws-sdk-s3 (1.109.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) - aws-sdk-sns (1.48.0) + aws-sdk-sns (1.49.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) aws-sigv4 (1.4.0) @@ -363,7 +363,7 @@ GEM crowdin-api (0.6.0) rest-client (~> 2.0) daemons (1.4.1) - dalli (3.0.5) + dalli (3.0.6) danger (8.4.2) claide (~> 1.0) claide-plugins (>= 0.9.2) @@ -406,7 +406,7 @@ GEM activerecord (>= 3.0, < 6.2) delayed_job (>= 3.0, < 5) diff-lcs (1.4.4) - disposable (0.6.1) + disposable (0.6.2) declarative (>= 0.0.9, < 1.0.0) representable (>= 3.1.1, < 3.2.0) domain_name (0.5.20190701) @@ -514,7 +514,7 @@ GEM ruby-progressbar (~> 1.4) git (1.9.1) rchardet (~> 1.8) - globalid (0.6.0) + globalid (1.0.0) activesupport (>= 5.0) gon (6.4.0) actionpack (>= 3.0.20) @@ -656,7 +656,7 @@ GEM parallel (1.21.0) parallel_tests (3.7.3) parallel - parser (3.0.2.0) + parser (3.0.3.1) ast (~> 2.4.1) pdf-core (0.9.0) pdf-inspector (1.3.0) @@ -832,7 +832,7 @@ GEM rubocop-ast (>= 1.12.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.13.0) + rubocop-ast (1.14.0) parser (>= 3.0.1.1) rubocop-rails (2.12.4) activesupport (>= 4.2.0) @@ -1008,7 +1008,7 @@ DEPENDENCIES deckar01-task_list (~> 2.3.1) delayed_cron_job (~> 0.9.0) delayed_job_active_record (~> 4.1.5) - disposable (~> 0.6.1) + disposable (~> 0.6.2) doorkeeper (~> 5.5.0) email_validator (~> 2.2.3) equivalent-xml (~> 0.6) diff --git a/lib/open_project/patches/disposable.rb b/lib/open_project/patches/disposable.rb deleted file mode 100644 index 5fd71bede9..0000000000 --- a/lib/open_project/patches/disposable.rb +++ /dev/null @@ -1,61 +0,0 @@ -#-- copyright -# OpenProject is an open source project management software. -# Copyright (C) 2012-2021 the OpenProject GmbH -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License version 3. -# -# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -# Copyright (C) 2006-2013 Jean-Philippe Lang -# Copyright (C) 2010-2013 the ChiliProject Team -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# See COPYRIGHT and LICENSE files for more details. -#++ - -# Disposable from 0.6.0 on includes Forwardable into every -# class inheriting from Disposable::Twin. OpenProject -# uses Disposable::Twin for the contracts. -# Including Forwardable overwrites the rails core_ext delegate -# on which e.g. ActiveModel::Naming relies. -OpenProject::Patches.patch_gem_version 'disposable', '6.0.1' do - # The patch thus loads the module including Forwardable, then removes the - # code and defines its own empty module. - module Disposable - class Twin - module Property - - end - end - end - - require "disposable/twin/property/unnest" - Disposable::Twin::Property.send(:remove_const, :Unnest) - - module Disposable - class Twin - module Property - module Unnest - def unnest(_name, _options) - raise 'Relying on patched away method' - end - end - end - end - end - - require 'disposable' -end diff --git a/modules/two_factor_authentication/openproject-two_factor_authentication.gemspec b/modules/two_factor_authentication/openproject-two_factor_authentication.gemspec index 20d8b08180..2ce558ea58 100644 --- a/modules/two_factor_authentication/openproject-two_factor_authentication.gemspec +++ b/modules/two_factor_authentication/openproject-two_factor_authentication.gemspec @@ -15,5 +15,5 @@ Gem::Specification.new do |s| s.add_dependency 'messagebird-rest', '~> 1.4.2' s.add_dependency 'rotp', '~> 6.1' - s.add_dependency 'aws-sdk-sns', '~> 1.48.0' + s.add_dependency 'aws-sdk-sns', '~> 1.49.0' end