From 96fc5d0dcb7de2e26613e3deed533f90628d2cb3 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Mon, 8 May 2023 21:58:25 +0530 Subject: [PATCH] Refresh patches --- .../Gemfile/0010-relax-stable-libs.patch | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/debian/patches/Gemfile/0010-relax-stable-libs.patch b/debian/patches/Gemfile/0010-relax-stable-libs.patch index dbde1332e6..b25e96a72f 100644 --- a/debian/patches/Gemfile/0010-relax-stable-libs.patch +++ b/debian/patches/Gemfile/0010-relax-stable-libs.patch @@ -3,7 +3,7 @@ gitlab Gemfile --- a/Gemfile +++ b/Gemfile -@@ -13,9 +13,9 @@ gem 'bundler-checksum', '~> 0.1.0', path +@@ -13,9 +13,9 @@ # NOTE: When incrementing the major or minor version here, also increment activerecord_version # in vendor/gems/attr_encrypted/attr_encrypted.gemspec until we resolve # https://gitlab.com/gitlab-org/gitlab/-/issues/375713 @@ -15,7 +15,7 @@ gitlab Gemfile # Pin openssl to match the version bundled with our supported Rubies. # See https://stdgems.org/openssl/#gem-version. -@@ -29,46 +29,46 @@ gem 'ipaddr', '1.2.2' +@@ -29,46 +29,46 @@ # Responders respond_to and respond_with gem 'responders', '~> 3.0' @@ -78,7 +78,7 @@ gitlab Gemfile gem 'omniauth-twitter', '~> 1.4' gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md gem 'omniauth_openid_connect', '~> 0.6.1' -@@ -77,8 +77,8 @@ gem 'omniauth_openid_connect', '~> 0.6.1 +@@ -77,8 +77,8 @@ gem 'openid_connect', '= 1.3.0' gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md gem 'omniauth-atlassian-oauth2', '~> 0.2.0' @@ -89,7 +89,7 @@ gitlab Gemfile # Kerberos authentication. EE-only gem 'gssapi', '~> 1.3.1', group: :kerberos -@@ -87,28 +87,28 @@ gem 'timfel-krb5-auth', '~> 0.8', group: +@@ -87,28 +87,28 @@ # Spam and anti-bot protection gem 'recaptcha', '~> 5.12', require: 'recaptcha/rails' gem 'akismet', '~> 3.0' @@ -124,7 +124,7 @@ gitlab Gemfile # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes -@@ -117,30 +117,30 @@ gem 'gitlab_omniauth-ldap', '~> 2.2.0', +@@ -117,30 +117,30 @@ gem 'net-ldap', '~> 0.17.1' # API @@ -163,16 +163,16 @@ gitlab Gemfile # for backups gem 'fog-aws', '~> 3.15' -@@ -158,7 +158,7 @@ gem 'fog-rackspace', '~> 0.1.1' +@@ -158,7 +158,7 @@ # We may want to update this dependency if this is ever addressed upstream, e.g. via # https://github.com/aliyun/aliyun-oss-ruby-sdk/pull/93 gem 'fog-aliyun', '~> 0.4' --gem 'gitlab-fog-azure-rm', '~> 1.4.0', require: 'fog/azurerm' -+gem 'gitlab-fog-azure-rm', '~> 1.4', require: 'fog/azurerm' +-gem 'gitlab-fog-azure-rm', '~> 1.7.0', require: 'fog/azurerm' ++gem 'gitlab-fog-azure-rm', '~> 1.7', require: 'fog/azurerm' # for Google storage gem 'google-cloud-storage', '~> 1.44.0' -@@ -176,36 +176,36 @@ gem 'google-apis-sqladmin_v1beta4', '~> +@@ -176,36 +176,36 @@ gem 'unf', '~> 0.1.4' # Seed data @@ -223,7 +223,7 @@ gitlab Gemfile # Calendar rendering gem 'icalendar' -@@ -215,12 +215,12 @@ gem 'diffy', '~> 3.4' +@@ -215,12 +215,12 @@ gem 'diff_match_patch', '~> 0.1.0' # Application server @@ -238,7 +238,7 @@ gitlab Gemfile gem 'puma_worker_killer', '~> 0.3.1', require: false gem 'sd_notify', '~> 0.1.0', require: false end -@@ -232,13 +232,13 @@ gem 'state_machines-activerecord', '~> 0 +@@ -232,13 +232,13 @@ gem 'acts-as-taggable-on', '~> 9.0' # Background jobs @@ -256,7 +256,7 @@ gitlab Gemfile # HTTP requests gem 'httparty', '~> 0.20.0' -@@ -250,10 +250,10 @@ gem 'rainbow', '~> 3.0' +@@ -250,10 +250,10 @@ gem 'ruby-progressbar', '~> 1.10' # GitLab settings @@ -269,7 +269,7 @@ gitlab Gemfile # Misc -@@ -266,21 +266,21 @@ gem 'js_regex', '~> 3.8' +@@ -266,21 +266,21 @@ gem 'device_detector' # Redis @@ -295,7 +295,7 @@ gitlab Gemfile # Hangouts Chat integration gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat' -@@ -296,10 +296,10 @@ gem 'kubeclient', '~> 4.9.3', path: 'ven +@@ -296,10 +296,10 @@ # Sanitize user input gem 'sanitize', '~> 6.0' @@ -308,7 +308,7 @@ gitlab Gemfile # Working with license # Detects the open source license the repository includes -@@ -321,32 +321,32 @@ gem 'gitlab_chronic_duration', '~> 0.10. +@@ -321,32 +321,32 @@ gem 'rack-proxy', '~> 0.7.6' @@ -352,7 +352,7 @@ gitlab Gemfile gem 'gitlab-labkit', '~> 0.30.1' gem 'thrift', '>= 0.16.0' -@@ -354,11 +354,11 @@ gem 'thrift', '>= 0.16.0' +@@ -354,11 +354,11 @@ # I18n gem 'ruby_parser', '~> 3.19', require: false gem 'rails-i18n', '~> 7.0' @@ -366,7 +366,7 @@ gitlab Gemfile # Perf bar gem 'peek', '~> 1.1' -@@ -367,10 +367,10 @@ gem 'peek', '~> 1.1' +@@ -367,10 +367,10 @@ gem 'snowplow-tracker', '~> 0.8.0' # Metrics @@ -379,7 +379,7 @@ gitlab Gemfile group :development do gem 'lefthook', '~> 1.2.9', require: false -@@ -452,24 +452,24 @@ group :development, :test, :omnibus do +@@ -452,24 +452,24 @@ end group :test do @@ -415,7 +415,7 @@ gitlab Gemfile gem 'rspec_junit_formatter' gem 'guard-rspec' -@@ -498,8 +498,8 @@ gem 'oauth2', '~> 2.0' +@@ -498,8 +498,8 @@ gem 'health_check', '~> 3.0' # System information @@ -426,7 +426,7 @@ gitlab Gemfile # NTP client gem 'net-ntp' -@@ -508,25 +508,25 @@ gem 'net-ntp' +@@ -508,25 +508,25 @@ gem 'ssh_data', '~> 1.3' # Spamcheck GRPC protocol definitions @@ -457,7 +457,7 @@ gitlab Gemfile gem 'gitlab-experiment', '~> 0.7.1' # Structured logging -@@ -537,9 +537,9 @@ gem 'grape_logging', '~> 1.8' +@@ -537,9 +537,9 @@ gem 'gitlab-net-dns', '~> 0.9.1' # Countries list @@ -469,7 +469,7 @@ gitlab Gemfile # LRU cache gem 'lru_redux' -@@ -553,18 +553,18 @@ gem 'mail-smtp_pool', '~> 0.1.0', path: +@@ -553,18 +553,18 @@ gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer' # File encryption @@ -493,7 +493,7 @@ gitlab Gemfile gem 'webauthn', '~> 2.3' -@@ -575,14 +575,14 @@ gem 'parslet', '~> 1.8' +@@ -575,14 +575,14 @@ gem 'ipynbdiff', path: 'vendor/gems/ipynbdiff'