diff options
Diffstat (limited to 'www/gitlab-ce/files/patch-Gemfile')
| -rw-r--r-- | www/gitlab-ce/files/patch-Gemfile | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index 7fc7a295d360..29e7c33283b7 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2023-01-12 20:03:13 UTC +--- Gemfile.orig 2023-01-20 09:57:01 UTC +++ Gemfile @@ -13,13 +13,13 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems # NOTE: When incrementing the major or minor version here, also increment activerecord_version @@ -48,15 +48,6 @@ # Kerberos authentication. EE-only gem 'gssapi', group: :kerberos -@@ -113,7 +113,7 @@ gem 'gpgme', '~> 2.0.22' - # GitLab fork with several improvements to original library. For full list of changes - # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master - gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omniauth-ldap' --gem 'net-ldap', '~> 0.16.3' -+gem 'net-ldap', '~> 0.17.1' - - # API - gem 'grape', '~> 1.5.2' @@ -223,7 +223,7 @@ gem 'redis-namespace', '~> 1.9.0' gem 'gitlab-sidekiq-fetcher', '0.9.0', require: 'sidekiq-reliable-fetch' @@ -77,12 +68,12 @@ gem 'warning', '~> 1.3.0' -group :development do -- gem 'lefthook', '~> 1.2.6', require: false +- gem 'lefthook', '~> 1.2.7', require: false - gem 'rubocop' - gem 'solargraph', '~> 0.47.2', require: false - - gem 'letter_opener_web', '~> 2.0.0' -- gem 'lookbook', '~> 1.2', '>= 1.2.1' +- gem 'lookbook', '~> 1.4', '>= 1.4.5' - - # Better errors handler - gem 'better_errors', '~> 2.9.1' @@ -114,7 +105,7 @@ - gem 'spring', '~> 4.1.0' - gem 'spring-commands-rspec', '~> 1.0.4' - -- gem 'gitlab-styles', '~> 9.1.0', require: false +- gem 'gitlab-styles', '~> 9.2.0', require: false - - gem 'haml_lint', '~> 0.40.0', require: false - gem 'bundler-audit', '~> 0.7.0.1', require: false @@ -202,7 +193,7 @@ gem 'retriable', '~> 3.1.2' -@@ -544,7 +448,7 @@ gem 'lockbox', '~> 0.6.2' +@@ -544,7 +448,7 @@ gem 'lockbox', '~> 1.1.1' gem 'valid_email', '~> 0.1' # JSON |