diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2024-05-20 11:51:24 +0300 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2024-05-21 11:24:43 +0300 |
| commit | 31f2eff375601bfe9cf31ce3887971650c6c7215 (patch) | |
| tree | 0016ccea0e8a3a0ebf8cd25006abe73dd808807a /www/gitlab/files/patch-Gemfile | |
| parent | devel/gitlab-runner: update to 17.0.0 (diff) | |
www/gitlab: major update to 17.0.0
Make sure you update to 16.11.x before!
Changes: https://about.gitlab.com/releases/2024/05/16/gitlab-17-0-released/
Diffstat (limited to 'www/gitlab/files/patch-Gemfile')
| -rw-r--r-- | www/gitlab/files/patch-Gemfile | 59 |
1 files changed, 24 insertions, 35 deletions
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index 19e303a3e6a7..cb36ba55d06e 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2024-04-17 11:47:15 UTC +--- Gemfile.orig 2024-05-15 08:00:50 UTC +++ Gemfile @@ -58,7 +58,7 @@ gem 'rugged', '~> 1.6' # rubocop:todo Gemfile/MissingF @@ -9,18 +9,16 @@ gem 'marginalia', '~> 1.11.1' # rubocop:todo Gemfile/MissingFeatureCategory # Authorization -@@ -78,8 +78,8 @@ gem 'omniauth-alicloud', '~> 3.0.0' # rubocop:todo Gem - gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md # rubocop:todo Gemfile/MissingFeatureCategory - gem 'omniauth-dingtalk-oauth2', '~> 1.0' # rubocop:todo Gemfile/MissingFeatureCategory +@@ -76,7 +76,7 @@ gem 'omniauth-alicloud', '~> 3.0.0' # rubocop:todo Gem + gem 'omniauth-auth0', '~> 3.1' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'omniauth-azure-activedirectory-v2', '~> 2.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-alicloud', '~> 3.0.0' # rubocop:todo Gemfile/MissingFeatureCategory --gem 'omniauth-facebook', '~> 4.0.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'omniauth-github', '2.0.1' # rubocop:todo Gemfile/MissingFeatureCategory -+gem 'omniauth-facebook', '>= 4.0.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'omniauth-github', '~> 2.0.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-google-oauth2', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-oauth2-generic', '~> 0.2.2' # rubocop:todo Gemfile/MissingFeatureCategory -@@ -90,7 +90,7 @@ gem 'omniauth_openid_connect', '~> 0.6.1' # rubocop:to +@@ -86,7 +86,7 @@ gem 'omniauth_openid_connect', '~> 0.6.1' # rubocop:to gem 'omniauth_openid_connect', '~> 0.6.1' # rubocop:todo Gemfile/MissingFeatureCategory # 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 +27,7 @@ gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-atlassian-oauth2', '~> 0.2.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'rack-oauth2', '~> 1.21.3' # rubocop:todo Gemfile/MissingFeatureCategory -@@ -185,7 +185,7 @@ gem 'google-cloud-storage', '~> 1.45.0' # rubocop:todo +@@ -181,7 +181,7 @@ gem 'google-cloud-storage', '~> 1.45.0' # rubocop:todo gem 'google-apis-storage_v1', '~> 0.29' # rubocop:todo Gemfile/MissingFeatureCategory gem 'google-cloud-storage', '~> 1.45.0' # rubocop:todo Gemfile/MissingFeatureCategory # We need >= 0.11.1 because that's when match_glob support is added to list_objects @@ -38,7 +36,7 @@ gem 'google-apis-compute_v1', '~> 0.57.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'google-apis-container_v1', '~> 0.43.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'google-apis-container_v1beta1', '~> 0.43.0' # rubocop:todo Gemfile/MissingFeatureCategory -@@ -196,7 +196,7 @@ gem 'google-apis-androidpublisher_v3', '~> 0.34.0' # r +@@ -192,7 +192,7 @@ gem 'google-apis-androidpublisher_v3', '~> 0.34.0' # r gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'google-apis-androidpublisher_v3', '~> 0.34.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -47,19 +45,19 @@ gem 'google-cloud-artifact_registry-v1', '~> 0.11.0', feature_category: :shared gem 'google-cloud-compute-v1', '~> 2.6.0', feature_category: :shared -@@ -207,9 +207,9 @@ gem 'elasticsearch-api', '7.13.3' # rubocop:todo Gem +@@ -203,9 +203,9 @@ gem 'elasticsearch-api', '7.13.3' # rubocop:todo Gem gem 'elasticsearch-model', '~> 7.2' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-api', '7.13.3' # rubocop:todo Gemfile/MissingFeatureCategory --gem 'aws-sdk-core', '~> 3.191.6' # rubocop:todo Gemfile/MissingFeatureCategory -+gem 'aws-sdk-core', '~> 3.191' # rubocop:todo Gemfile/MissingFeatureCategory +-gem 'aws-sdk-core', '~> 3.194.2' # rubocop:todo Gemfile/MissingFeatureCategory ++gem 'aws-sdk-core', '~> 3.194' # rubocop:todo Gemfile/MissingFeatureCategory gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory --gem 'aws-sdk-s3', '~> 1.146.1' # rubocop:todo Gemfile/MissingFeatureCategory -+gem 'aws-sdk-s3', '~> 1.146' # rubocop:todo Gemfile/MissingFeatureCategory +-gem 'aws-sdk-s3', '~> 1.149.1' # rubocop:todo Gemfile/MissingFeatureCategory ++gem 'aws-sdk-s3', '~> 1.149' # rubocop:todo Gemfile/MissingFeatureCategory gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # rubocop:todo Gemfile/MissingFeatureCategory -@@ -240,12 +240,12 @@ gem 'diff_match_patch', '~> 0.1.0', path: 'vendor/gems +@@ -236,12 +236,12 @@ gem 'diff_match_patch', '~> 0.1.0', path: 'vendor/gems gem 'diff_match_patch', '~> 0.1.0', path: 'vendor/gems/diff_match_patch', feature_category: :team_planning # Application server @@ -74,7 +72,7 @@ gem 'sd_notify', '~> 0.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory end -@@ -256,7 +256,7 @@ gem 'acts-as-taggable-on', '~> 10.0' # rubocop:todo Ge +@@ -252,7 +252,7 @@ gem 'acts-as-taggable-on', '~> 10.0' # rubocop:todo Ge gem 'acts-as-taggable-on', '~> 10.0' # rubocop:todo Gemfile/MissingFeatureCategory # Background jobs @@ -83,7 +81,7 @@ gem 'sidekiq-cron', '~> 1.12.0', feature_category: :shared gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', require: 'sidekiq-reliable-fetch' # rubocop:todo Gemfile/MissingFeatureCategory -@@ -401,95 +401,10 @@ gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/Missi +@@ -425,95 +425,10 @@ gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/Missi gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -93,7 +91,7 @@ - gem 'solargraph', '~> 0.47.2', require: false # rubocop:todo Gemfile/MissingFeatureCategory - - gem 'letter_opener_web', '~> 2.0.0' # rubocop:todo Gemfile/MissingFeatureCategory -- gem 'lookbook', '~> 2.2', '>= 2.2.2' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'lookbook', '~> 2.3' # rubocop:todo Gemfile/MissingFeatureCategory - - # Better errors handler - gem 'better_errors', '~> 2.10.1' # rubocop:todo Gemfile/MissingFeatureCategory @@ -102,7 +100,7 @@ - - gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory - -- gem 'ruby-lsp', "~> 0.14.6", require: false, feature_category: :tooling +- gem 'ruby-lsp', "~> 0.16.6", require: false, feature_category: :tooling - - gem 'ruby-lsp-rails', "~> 0.3.3", feature_category: :tooling - @@ -132,7 +130,7 @@ - gem 'spring-commands-rspec', '~> 1.0.4' # rubocop:todo Gemfile/MissingFeatureCategory - - gem 'gitlab-styles', '~> 11.0.0', feature_category: :tooling -- gem 'haml_lint', '~> 0.53', feature_category: :tooling +- gem 'haml_lint', '~> 0.57', feature_category: :tooling - - gem 'bundler-audit', '~> 0.9.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory - @@ -179,7 +177,7 @@ # Gems required in omnibus-gitlab pipeline group :development, :test, :omnibus do gem 'license_finder', '~> 7.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory -@@ -501,36 +416,6 @@ end +@@ -525,36 +440,6 @@ end gem 'gitlab-rspec_flaky', path: 'gems/gitlab-rspec_flaky', feature_category: :tooling end @@ -202,7 +200,7 @@ - gem 'webmock', '~> 3.23.0', feature_category: :shared - gem 'rails-controller-testing' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'concurrent-ruby', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory -- gem 'test-prof', '~> 1.3.2', feature_category: :tooling +- gem 'test-prof', '~> 1.3.3', feature_category: :tooling - gem 'rspec_junit_formatter' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'guard-rspec' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'axe-core-rspec', '~> 4.9.0', feature_category: :tooling @@ -210,22 +208,13 @@ - # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 - gem 'derailed_benchmarks', require: false # rubocop:todo Gemfile/MissingFeatureCategory - -- gem 'gitlab_quality-test_tooling', '~> 1.21.1', require: false, feature_category: :tooling +- gem 'gitlab_quality-test_tooling', '~> 1.24.0', require: false, feature_category: :tooling -end - gem 'octokit', '~> 8.1', feature_category: :importers gem 'gitlab-mail_room', '~> 0.0.24', require: 'mail_room', feature_category: :shared -@@ -568,7 +453,7 @@ gem 'kas-grpc', '~> 0.4.0', feature_category: :deploym - # KAS GRPC protocol definitions - gem 'kas-grpc', '~> 0.4.0', feature_category: :deployment_management - --gem 'grpc', '~> 1.60.0' # rubocop:todo Gemfile/MissingFeatureCategory -+gem 'grpc', '~> 1.60' # rubocop:todo Gemfile/MissingFeatureCategory - - gem 'google-protobuf', '~> 3.25', '>= 3.25.3' # rubocop:todo Gemfile/MissingFeatureCategory - -@@ -589,7 +474,7 @@ gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfil +@@ -613,7 +498,7 @@ gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfil gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfile/MissingFeatureCategory # Countries list @@ -234,7 +223,7 @@ gem 'retriable', '~> 3.1.2' # rubocop:todo Gemfile/MissingFeatureCategory -@@ -655,6 +540,7 @@ gem 'telesignenterprise', '~> 2.2' # rubocop:todo Gemf +@@ -679,6 +564,7 @@ gem 'telesignenterprise', '~> 2.2' # rubocop:todo Gemf gem 'telesignenterprise', '~> 2.2' # rubocop:todo Gemfile/MissingFeatureCategory # BufferedIO patch @@ -242,7 +231,7 @@ # Updating this version will require updating scripts/allowed_warnings.txt gem 'net-protocol', '~> 0.1.3' # rubocop:todo Gemfile/MissingFeatureCategory # Lock this until we make DNS rebinding work with the updated net-http: -@@ -662,5 +548,11 @@ gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/Missing +@@ -686,5 +572,11 @@ gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/Missing gem 'net-http', '= 0.1.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory |
