diff options
author | James Fargher <jfargher@gitlab.com> | 2021-10-06 04:09:50 +0300 |
---|---|---|
committer | James Fargher <jfargher@gitlab.com> | 2021-10-06 04:11:30 +0300 |
commit | e3207df5b2e0e9f6a572f41ca27570864fef2ab3 (patch) | |
tree | 4b6cd47d8af7a1cced4b7e6fc30742bef28ad6d8 | |
parent | deb7bdb3512bbbd42373dafef2560a662eb685d0 (diff) |
Update ruby gem activesupport to v6.1.4.1
Since gitlab-labkit also depends on activesupport, this needed updating
too.
These gems have been updated to match gitlab-rails.
Changelog: changed
-rw-r--r-- | ruby/Gemfile | 4 | ||||
-rw-r--r-- | ruby/Gemfile.lock | 28 |
2 files changed, 16 insertions, 16 deletions
diff --git a/ruby/Gemfile b/ruby/Gemfile index 7eaf3c0f2..662252527 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' gem 'rugged', '~> 1.1' gem 'github-linguist', '~> 7.12', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' -gem 'activesupport', '~> 6.1.3.2' +gem 'activesupport', '~> 6.1.4.1' gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.1', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false @@ -13,7 +13,7 @@ gem 'faraday', '~> 1.0' gem 'rbtrace', require: false # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.20.0' +gem 'gitlab-labkit', '~> 0.21.1' # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index dba345db6..05e75a524 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.3.2) - actionview (= 6.1.3.2) - activesupport (= 6.1.3.2) + actionpack (6.1.4.1) + actionview (= 6.1.4.1) + activesupport (= 6.1.4.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.3.2) - activesupport (= 6.1.3.2) + actionview (6.1.4.1) + activesupport (= 6.1.4.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (6.1.3.2) + activesupport (6.1.4.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -65,10 +65,10 @@ GEM gitlab-gollum-rugged_adapter (0.4.4.4.gitlab.1) mime-types (>= 1.15) rugged (~> 1.0) - gitlab-labkit (0.20.0) + gitlab-labkit (0.21.2) actionpack (>= 5.0.0, < 7.0.0) activesupport (>= 5.0.0, < 7.0.0) - grpc (~> 1.19) + grpc (~> 1.30) jaeger-client (~> 1.1) opentracing (~> 0.4) pg_query (~> 2.1) @@ -94,7 +94,7 @@ GEM reverse_markdown (~> 1.0) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) - loofah (2.10.0) + loofah (2.12.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) @@ -139,7 +139,7 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.3.0) + rails-html-sanitizer (1.4.2) loofah (~> 2.3) rainbow (3.0.0) rbtrace (0.4.14) @@ -147,7 +147,7 @@ GEM msgpack (>= 0.4.3) optimist (>= 3.0.0) rdoc (6.3.2) - redis (4.2.5) + redis (4.4.0) regexp_parser (1.8.1) reverse_markdown (1.4.0) nokogiri @@ -197,7 +197,7 @@ GEM stringex (2.8.5) thor (1.1.0) thread_safe (0.3.6) - thrift (0.14.1) + thrift (0.15.0) timecop (0.9.1) tzinfo (2.0.4) concurrent-ruby (~> 1.0) @@ -216,13 +216,13 @@ PLATFORMS ruby DEPENDENCIES - activesupport (~> 6.1.3.2) + activesupport (~> 6.1.4.1) factory_bot faraday (~> 1.0) github-linguist (~> 7.12) gitlab-gollum-lib (~> 4.2.7.10.gitlab.1) gitlab-gollum-rugged_adapter (~> 0.4.4.4.gitlab.1) - gitlab-labkit (~> 0.20.0) + gitlab-labkit (~> 0.21.1) gitlab-markup (~> 1.7.1) google-protobuf (~> 3.17.0) grpc (~> 1.30.2) |