diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-19 15:57:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-19 15:57:54 +0300 |
commit | 419c53ec62de6e97a517abd5fdd4cbde3a942a34 (patch) | |
tree | 1f43a548b46bca8a5fb8fe0c31cef1883d49c5b6 /vendor | |
parent | 1da20d9135b3ad9e75e65b028bffc921aaf8deb7 (diff) |
Add latest changes from gitlab-org/gitlab@16-5-stable-eev16.5.0-rc42
Diffstat (limited to 'vendor')
-rw-r--r-- | vendor/gems/attr_encrypted/Gemfile.lock | 54 | ||||
-rw-r--r-- | vendor/gems/attr_encrypted/attr_encrypted.gemspec | 2 | ||||
-rwxr-xr-x | vendor/gems/attr_encrypted/test/run.sh | 12 |
3 files changed, 29 insertions, 39 deletions
diff --git a/vendor/gems/attr_encrypted/Gemfile.lock b/vendor/gems/attr_encrypted/Gemfile.lock index ac362d2625e..d7a7faab572 100644 --- a/vendor/gems/attr_encrypted/Gemfile.lock +++ b/vendor/gems/attr_encrypted/Gemfile.lock @@ -7,25 +7,25 @@ PATH GEM remote: https://rubygems.org/ specs: - actionpack (7.0.6) - actionview (= 7.0.6) - activesupport (= 7.0.6) + actionpack (7.0.8) + actionview (= 7.0.8) + activesupport (= 7.0.8) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.6) - activesupport (= 7.0.6) + actionview (7.0.8) + activesupport (= 7.0.8) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (7.0.6) - activesupport (= 7.0.6) - activerecord (7.0.6) - activemodel (= 7.0.6) - activesupport (= 7.0.6) - activesupport (7.0.6) + activemodel (7.0.8) + activesupport (= 7.0.8) + activerecord (7.0.8) + activemodel (= 7.0.8) + activesupport (= 7.0.8) + activesupport (7.0.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -38,7 +38,7 @@ GEM builder (3.2.4) codeclimate-test-reporter (0.6.0) simplecov (>= 0.7.1, < 1.0.0) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.2) crass (1.0.6) data_objects (0.10.17) addressable (~> 2.1) @@ -92,29 +92,31 @@ GEM encryptor (3.0.0) erubi (1.12.0) fastercsv (1.5.5) - i18n (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) json (1.8.6) json_pure (1.8.6) - loofah (2.19.1) + loofah (2.21.3) crass (~> 1.0.2) - nokogiri (>= 1.5.9) + nokogiri (>= 1.12.0) mini_portile2 (2.8.0) minitest (5.16.3) multi_json (1.15.0) - nokogiri (1.14.0) + nokogiri (1.14.5) mini_portile2 (~> 2.8.0) racc (~> 1.4) public_suffix (5.0.0) - racc (1.6.2) - rack (2.2.6.2) - rack-test (2.0.2) + racc (1.7.1) + rack (2.2.8) + rack-test (2.1.0) rack (>= 1.3) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.5.0) - loofah (~> 2.19, >= 2.19.1) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) rake (13.0.6) sequel (5.60.1) simplecov (0.21.2) @@ -128,7 +130,7 @@ GEM sqlite3 (1.5.0) mini_portile2 (~> 2.8.0) stringex (1.5.1) - tzinfo (2.0.5) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) uuidtools (2.2.0) @@ -136,8 +138,8 @@ PLATFORMS ruby DEPENDENCIES - actionpack (~> 7.0.6) - activerecord (~> 7.0.6) + actionpack (~> 7.0.8) + activerecord (~> 7.0.8) attr_encrypted! codeclimate-test-reporter (<= 0.6.0) datamapper diff --git a/vendor/gems/attr_encrypted/attr_encrypted.gemspec b/vendor/gems/attr_encrypted/attr_encrypted.gemspec index 026fe84034d..3711b16ffcf 100644 --- a/vendor/gems/attr_encrypted/attr_encrypted.gemspec +++ b/vendor/gems/attr_encrypted/attr_encrypted.gemspec @@ -31,7 +31,7 @@ Forked from https://github.com/attr-encrypted/attr_encrypted." s.add_dependency('encryptor', ['~> 3.0.0']) - activerecord_version = "~> 7.0.6" + activerecord_version = "~> 7.0.8" s.add_development_dependency('activerecord', activerecord_version) s.add_development_dependency('actionpack', activerecord_version) s.add_development_dependency('datamapper') diff --git a/vendor/gems/attr_encrypted/test/run.sh b/vendor/gems/attr_encrypted/test/run.sh deleted file mode 100755 index 7e9b777eebf..00000000000 --- a/vendor/gems/attr_encrypted/test/run.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env sh -e - -for RUBY in 1.9.3 2.0.0 2.1 2.2 -do - for RAILS in 2.3.8 3.0.0 3.1.0 3.2.0 4.0.0 4.1.0 4.2.0 - do - if [[ $RUBY -gt 1.9.3 && $RAILS -lt 4.0.0 ]]; then - continue - fi - RBENV_VERSION=$RUBY ACTIVERECORD=$RAILS bundle && bundle exec rake - done -done |