diff options
| author | Stan Hu <stanhu@gmail.com> | 2022-07-27 08:57:43 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2022-07-27 08:57:43 +0300 |
| commit | 2150f1e92b4473bede670d2ac32d9b9f7e4d17a9 (patch) | |
| tree | 211700ec86bd3af68d25cf1ff1cc62f93e289826 | |
| parent | 81786f3bfc58fbe460ed285cbd745206802abe7e (diff) | |
| parent | a3535f2bf3963e4a9aaf4feed645c05abed45432 (diff) | |
Merge branch 'sh-bump-rails-gems-6.1.6.1' into 'master'
Bump all Rails-related gems to v6.1.6.1
See merge request gitlab-org/gitaly!4759
| -rw-r--r-- | ruby/Gemfile | 2 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/ruby/Gemfile b/ruby/Gemfile index cbb9321fd..3ffb5fc00 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' gem 'rugged', '~> 1.2' gem 'github-linguist', '~> 7.20.0', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' -gem 'activesupport', '~> 6.1.4.7' +gem 'activesupport', '~> 6.1.6.1' gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.2', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index fa214b30c..2d24d8eb1 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -2,20 +2,20 @@ GEM remote: https://rubygems.org/ specs: abstract_type (0.0.7) - actionpack (6.1.5.1) - actionview (= 6.1.5.1) - activesupport (= 6.1.5.1) + actionpack (6.1.6.1) + actionview (= 6.1.6.1) + activesupport (= 6.1.6.1) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.1.5.1) - activesupport (= 6.1.5.1) + actionview (6.1.6.1) + activesupport (= 6.1.6.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (6.1.5.1) + activesupport (6.1.6.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -88,7 +88,7 @@ GEM google-protobuf (~> 3.18) googleapis-common-protos-types (~> 1.0) grpc-tools (1.42.0) - i18n (1.10.0) + i18n (1.12.0) concurrent-ruby (~> 1.0) ice_nine (0.11.2) jaeger-client (1.1.0) @@ -112,7 +112,7 @@ GEM mime-types-data (3.2020.1104) mini_mime (1.1.2) mini_portile2 (2.8.0) - minitest (5.15.0) + minitest (5.16.2) msgpack (1.3.3) multipart-post (2.1.1) nokogiri (1.13.6) @@ -205,7 +205,7 @@ GEM thrift (0.15.0) timecop (0.9.1) tomlrb (2.0.1) - tzinfo (2.0.4) + tzinfo (2.0.5) concurrent-ruby (~> 1.0) unicode-display_width (1.7.0) unparser (0.4.7) @@ -219,13 +219,13 @@ GEM with_env (1.1.0) xml-simple (1.1.9) rexml - zeitwerk (2.5.4) + zeitwerk (2.6.0) PLATFORMS ruby DEPENDENCIES - activesupport (~> 6.1.4.7) + activesupport (~> 6.1.6.1) factory_bot faraday (~> 1.0) github-linguist (~> 7.20.0) |