summary refs log tree commit diff
path: root/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
diff options
context:
space:
mode:
authorYureka <yuka@yuka.dev>2023-04-11 19:15:42 +0200
committerGitHub <noreply@github.com>2023-04-11 19:15:42 +0200
commit309b8ce82deac47a92fb69fc334a28434b0427b2 (patch)
treee5d57178a6cb3f4ac21f44566f1a5260f12db705 /pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
parent0d29297c7c4b0a7215495262d6b664dfa53a688b (diff)
downloadnixpkgs-309b8ce82deac47a92fb69fc334a28434b0427b2.tar
nixpkgs-309b8ce82deac47a92fb69fc334a28434b0427b2.tar.gz
nixpkgs-309b8ce82deac47a92fb69fc334a28434b0427b2.tar.bz2
nixpkgs-309b8ce82deac47a92fb69fc334a28434b0427b2.tar.lz
nixpkgs-309b8ce82deac47a92fb69fc334a28434b0427b2.tar.xz
nixpkgs-309b8ce82deac47a92fb69fc334a28434b0427b2.tar.zst
nixpkgs-309b8ce82deac47a92fb69fc334a28434b0427b2.zip
gitlab: 15.10.1 -> 15.10.2 (#225716)
https://about.gitlab.com/releases/2023/04/05/gitlab-15-10-2-released/
Diffstat (limited to 'pkgs/applications/version-management/gitlab/rubyEnv/Gemfile')
-rw-r--r--pkgs/applications/version-management/gitlab/rubyEnv/Gemfile12
1 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
index 8cafe3b8909..15995b07e1f 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
@@ -546,7 +546,7 @@ gem 'lru_redux'
 # Locked as long as quoted-printable encoding issues are not resolved
 # Monkey-patched in `config/initializers/mail_encoding_patch.rb`
 # See https://gitlab.com/gitlab-org/gitlab/issues/197386
-gem 'mail', '= 2.7.1'
+gem 'mail', '= 2.8.1'
 gem 'mail-smtp_pool', '~> 0.1.0', path: 'vendor/gems/mail-smtp_pool', require: false
 
 gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer'
@@ -593,12 +593,8 @@ gem 'app_store_connect'
 # For phone verification
 gem 'telesignenterprise', '~> 2.2'
 
-# Ruby 3 extracts net-protocol into a separate gem, while Ruby 2 has it built-in
-# This condition installs the gem only for Ruby 3 to avoid warnings on Ruby 2
-# Can be removed when support for Ruby 2 is dropped
-install_if -> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.0.0") } do
-  # BufferedIO patch
-  gem 'net-protocol', '~> 0.1.3'
-end
+# BufferedIO patch
+# Updating this version will require updating scripts/allowed_warnings.txt
+gem 'net-protocol', '~> 0.1.3'
 
 gem 'duo_api', '~> 1.3'