diff options
author | Dmitry Gruzd <dgruzd@gitlab.com> | 2021-09-21 12:55:40 +0300 |
---|---|---|
committer | Dmitry Gruzd <dgruzd@gitlab.com> | 2021-09-21 12:55:40 +0300 |
commit | 248e49909fd43fafe7287fdf3295f33b0f66bf83 (patch) | |
tree | 57772acdeac916b70ab3ecc3c992764d4a4dd6c8 | |
parent | 5b7382e0251176923f258aa8f8c23a8084f6cae9 (diff) |
Update activesupport to v6.1.4.1update-activesupport-to-6-1-4-1
This MR also updates dependent gems to the same version used in Rails
(https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70673). It will
save some space in Omnibus builds.
Changelog: changed
-rw-r--r-- | ruby/Gemfile | 4 | ||||
-rw-r--r-- | ruby/Gemfile.lock | 21 |
2 files changed, 14 insertions, 11 deletions
diff --git a/ruby/Gemfile b/ruby/Gemfile index 7eaf3c0f2..f0f21e636 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 @@ -31,3 +31,5 @@ group :development, :test do gem 'grpc-tools', '= 1.30.2' end + +gem 'nokogiri', '1.11.7' diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index dba345db6..4abe8cfec 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) @@ -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) @@ -104,7 +104,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2020.1104) mini_mime (1.0.2) - mini_portile2 (2.5.1) + mini_portile2 (2.5.3) minitest (5.14.4) msgpack (1.3.3) multipart-post (2.1.1) @@ -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) @@ -216,7 +216,7 @@ PLATFORMS ruby DEPENDENCIES - activesupport (~> 6.1.3.2) + activesupport (~> 6.1.4.1) factory_bot faraday (~> 1.0) github-linguist (~> 7.12) @@ -228,6 +228,7 @@ DEPENDENCIES grpc (~> 1.30.2) grpc-tools (= 1.30.2) licensee (~> 9.14.1) + nokogiri (= 1.11.7) pry (~> 0.12.2) rbtrace rdoc (~> 6.0) |