diff options
Diffstat (limited to 'www/gitlab-ce/files/patch-Gemfile')
| -rw-r--r-- | www/gitlab-ce/files/patch-Gemfile | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index cf6bd0bf11c5..da8b1cea2069 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2023-05-22 18:44:12 UTC +--- Gemfile.orig 2023-06-21 08:07:20 UTC +++ Gemfile @@ -35,7 +35,7 @@ gem 'neighbor', '~> 0.2.3' gem 'rugged', '~> 1.5' @@ -20,7 +20,7 @@ gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md gem 'omniauth-google-oauth2', '~> 1.1' gem 'omniauth-oauth2-generic', '~> 0.2.2' -@@ -66,7 +66,7 @@ gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/o +@@ -67,7 +67,7 @@ gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/o gem 'omniauth_openid_connect', '~> 0.6.1' # Locked until Ruby 3.0 upgrade since upgrading will pull in an updated net-smtp gem. # See https://docs.gitlab.com/ee/development/emails.html#rationale. @@ -29,7 +29,7 @@ gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md gem 'omniauth-atlassian-oauth2', '~> 0.2.0' gem 'rack-oauth2', '~> 1.21.3' -@@ -151,7 +151,7 @@ gem 'gitlab-fog-azure-rm', '~> 1.7.0', require: 'fog/a +@@ -152,7 +152,7 @@ gem 'gitlab-fog-azure-rm', '~> 1.7.0', require: 'fog/a # for Google storage gem 'google-cloud-storage', '~> 1.44.0' @@ -38,15 +38,6 @@ gem 'google-apis-compute_v1', '~> 0.57.0' gem 'google-apis-container_v1', '~> 0.43.0' gem 'google-apis-container_v1beta1', '~> 0.43.0' -@@ -172,7 +172,7 @@ gem 'seed-fu', '~> 2.3.7' - gem 'elasticsearch-model', '~> 7.2' - gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' - gem 'elasticsearch-api', '7.13.3' --gem 'aws-sdk-core', '~> 3.172.0' -+gem 'aws-sdk-core', '~> 3.172' - gem 'aws-sdk-cloudformation', '~> 1' - gem 'aws-sdk-s3', '~> 1.122.0' - gem 'faraday_middleware-aws-sigv4', '~>0.3.0' @@ -274,7 +274,7 @@ gem 'slack-messenger', '~> 2.3.4' gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat' @@ -56,12 +47,12 @@ # FogBugz integration gem 'ruby-fogbugz', '~> 0.3.0' -@@ -367,115 +367,17 @@ gem 'prometheus-client-mmap', '~> 0.23', require: 'pro +@@ -367,118 +367,17 @@ gem 'prometheus-client-mmap', '~> 0.25', require: 'pro gem 'warning', '~> 1.3.0' -group :development do -- gem 'lefthook', '~> 1.3.13', require: false +- gem 'lefthook', '~> 1.4.2', require: false - gem 'rubocop' - gem 'solargraph', '~> 0.47.2', require: false - @@ -69,7 +60,7 @@ - gem 'lookbook', '~> 2.0', '>= 2.0.1' - - # Better errors handler -- gem 'better_errors', '~> 2.10.0' +- gem 'better_errors', '~> 2.10.1' - - gem 'sprite-factory', '~> 1.7' - @@ -79,6 +70,7 @@ -group :development, :test do - gem 'deprecation_toolkit', '~> 1.5.1', require: false - gem 'bullet', '~> 7.0.2' +- gem 'parser', '~> 3.2', '>= 3.2.2.3' - gem 'pry-byebug' - gem 'pry-rails', '~> 0.3.9' - gem 'pry-shell', '~> 0.6.1' @@ -147,7 +139,7 @@ - gem 'rspec-parameterized', '~> 1.0', require: false +gem 'octokit', '>= 4.15' -- gem 'capybara', '~> 3.39' +- gem 'capybara', '~> 3.39', '>= 3.39.1' - gem 'capybara-screenshot', '~> 1.0.26' - # 4.9.1 drops Ruby 2.7 support. We can upgrade further after we drop Ruby 2.7 support. - gem 'selenium-webdriver', '= 4.9.0' @@ -166,6 +158,8 @@ - - # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 - gem 'derailed_benchmarks', require: false +- +- gem 'gitlab_quality-test_tooling', '~> 0.8.1', require: false -end - -gem 'octokit', '~> 4.15' @@ -173,14 +167,14 @@ gem 'gitlab-mail_room', '~> 0.0.23', require: 'mail_room' gem 'email_reply_trimmer', '~> 0.1' -@@ -511,14 +413,14 @@ gem 'gitaly', '~> 15.9.0-rc3' +@@ -514,14 +413,14 @@ gem 'gitaly', '~> 16.1.0-rc2' # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.1.0' -gem 'grpc', '~> 1.42.0' +gem 'grpc', '~> 1.42' - gem 'google-protobuf', '~> 3.22', '>= 3.22.3' + gem 'google-protobuf', '~> 3.23', '>= 3.23.3' gem 'toml-rb', '~> 2.2.0' @@ -190,7 +184,7 @@ gem 'flipper-active_record', '~> 0.25.0' gem 'flipper-active_support_cache_store', '~> 0.25.0' gem 'unleash', '~> 3.2.2' -@@ -532,7 +434,7 @@ gem 'grape_logging', '~> 1.8' +@@ -535,7 +434,7 @@ gem 'grape_logging', '~> 1.8' gem 'gitlab-net-dns', '~> 0.9.2' # Countries list @@ -199,7 +193,7 @@ gem 'retriable', '~> 3.1.2' -@@ -579,6 +481,11 @@ gem 'ed25519', '~> 1.3.0' +@@ -582,6 +481,11 @@ gem 'ed25519', '~> 1.3.0' # Error Tracking OpenAPI client # See https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/development/rake_tasks.md#update-openapi-client-for-error-tracking-feature gem 'error_tracking_open_api', path: 'vendor/gems/error_tracking_open_api' |