Merge remote-tracking branch 'upstream/pull/5483'
This commit is contained in:
commit
2c1428c9ad
2 changed files with 11 additions and 9 deletions
1
Gemfile
1
Gemfile
|
@ -55,6 +55,7 @@ gem "bootstrap_form", "~> 5.0"
|
||||||
gem "cancancan"
|
gem "cancancan"
|
||||||
gem "config"
|
gem "config"
|
||||||
gem "delayed_job_active_record"
|
gem "delayed_job_active_record"
|
||||||
|
gem "dry-schema", "< 1.14.0" # see https://github.com/openstreetmap/openstreetmap-website/issues/5482
|
||||||
gem "dry-validation"
|
gem "dry-validation"
|
||||||
gem "frozen_record"
|
gem "frozen_record"
|
||||||
gem "http_accept_language", "~> 2.1.1"
|
gem "http_accept_language", "~> 2.1.1"
|
||||||
|
|
19
Gemfile.lock
19
Gemfile.lock
|
@ -230,13 +230,13 @@ GEM
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
dry-core (~> 1.1)
|
dry-core (~> 1.1)
|
||||||
zeitwerk (~> 2.6)
|
zeitwerk (~> 2.6)
|
||||||
dry-schema (1.14.0)
|
dry-schema (1.13.4)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
dry-configurable (~> 1.0, >= 1.0.1)
|
dry-configurable (~> 1.0, >= 1.0.1)
|
||||||
dry-core (~> 1.1)
|
dry-core (~> 1.0, < 2)
|
||||||
dry-initializer (~> 3.2)
|
dry-initializer (~> 3.0)
|
||||||
dry-logic (~> 1.5)
|
dry-logic (>= 1.4, < 2)
|
||||||
dry-types (~> 1.8)
|
dry-types (>= 1.7, < 2)
|
||||||
zeitwerk (~> 2.6)
|
zeitwerk (~> 2.6)
|
||||||
dry-types (1.8.0)
|
dry-types (1.8.0)
|
||||||
bigdecimal (~> 3.0)
|
bigdecimal (~> 3.0)
|
||||||
|
@ -245,11 +245,11 @@ GEM
|
||||||
dry-inflector (~> 1.0)
|
dry-inflector (~> 1.0)
|
||||||
dry-logic (~> 1.4)
|
dry-logic (~> 1.4)
|
||||||
zeitwerk (~> 2.6)
|
zeitwerk (~> 2.6)
|
||||||
dry-validation (1.11.0)
|
dry-validation (1.10.0)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
dry-core (~> 1.1)
|
dry-core (~> 1.0, < 2)
|
||||||
dry-initializer (~> 3.2)
|
dry-initializer (~> 3.0)
|
||||||
dry-schema (~> 1.14)
|
dry-schema (>= 1.12, < 2)
|
||||||
zeitwerk (~> 2.6)
|
zeitwerk (~> 2.6)
|
||||||
erb_lint (0.8.0)
|
erb_lint (0.8.0)
|
||||||
activesupport
|
activesupport
|
||||||
|
@ -696,6 +696,7 @@ DEPENDENCIES
|
||||||
doorkeeper
|
doorkeeper
|
||||||
doorkeeper-i18n
|
doorkeeper-i18n
|
||||||
doorkeeper-openid_connect
|
doorkeeper-openid_connect
|
||||||
|
dry-schema (< 1.14.0)
|
||||||
dry-validation
|
dry-validation
|
||||||
erb_lint
|
erb_lint
|
||||||
factory_bot_rails
|
factory_bot_rails
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue