diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index 5bd8578f8516..5e293c0db110 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,157 +1,160 @@ ---- Gemfile.orig 2022-05-20 13:56:26 UTC +--- Gemfile.orig 2022-05-27 19:14:13 UTC +++ Gemfile @@ -2,9 +2,9 @@ source 'https://rubygems.org' -gem 'rails', '~> 6.1.4.7' +gem 'rails', '~> 6.1.4' -gem 'bootsnap', '~> 1.9.4', require: false +gem 'bootsnap', '~> 1.9', require: false # Responders respond_to and respond_with gem 'responders', '~> 3.0' @@ -92,7 +92,7 @@ gem 'gpgme', '~> 2.0.19' # 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.1.1', require: 'omniauth-ldap' -gem 'net-ldap', '~> 0.16.3' +gem 'net-ldap', '~> 0.16' # API gem 'grape', '~> 1.5.2' @@ -207,7 +207,7 @@ gem 'gitlab-sidekiq-fetcher', '0.8.0', require: 'sidek gem 'fugit', '~> 1.2.1' # HTTP requests -gem 'httparty', '~> 0.16.4' +gem 'httparty', '~> 0.16' # Colored output to console gem 'rainbow', '~> 3.0' -@@ -334,87 +334,15 @@ gem 'batch-loader', '~> 2.0.1' +@@ -334,87 +334,19 @@ gem 'batch-loader', '~> 2.0.1' gem 'peek', '~> 1.1' # Snowplow events tracking -gem 'snowplow-tracker', '~> 0.6.1' +gem 'snowplow-tracker', '~> 0.6' # Metrics gem 'method_source', '~> 1.0', require: false -gem 'webrick', '~> 1.6.1', require: false +gem 'webrick', '~> 1.6', require: false gem 'prometheus-client-mmap', '~> 0.15.0', require: 'prometheus/client' gem 'warning', '~> 1.2.0' -group :development do - gem 'lefthook', '~> 0.7.0', require: false - gem 'rubocop' - gem 'solargraph', '~> 0.44.3', require: false - - gem 'letter_opener_web', '~> 2.0.0' - - # Better errors handler - gem 'better_errors', '~> 2.9.0' - - # thin instead webrick - gem 'thin', '~> 1.8.0' - - gem 'sprite-factory', '~> 1.7' -end - -group :development, :test do - gem 'deprecation_toolkit', '~> 1.5.1', require: false - gem 'bullet', '~> 6.1.3' - gem 'pry-byebug' - gem 'pry-rails', '~> 0.3.9' - gem 'pry-shell', '~> 0.5.0' - - gem 'awesome_print', require: false - - gem 'database_cleaner', '~> 1.7.0' - gem 'factory_bot_rails', '~> 6.2.0' - gem 'rspec-rails', '~> 5.0.1' - - # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) - gem 'minitest', '~> 5.11.0' - - # Generate Fake data - gem 'ffaker', '~> 2.10' - - gem 'spring', '~> 2.1.0' - gem 'spring-commands-rspec', '~> 1.0.4' - - gem 'gitlab-styles', '~> 7.0.0', require: false - - gem 'haml_lint', '~> 0.36.0', require: false - gem 'bundler-audit', '~> 0.7.0.1', require: false - - gem 'benchmark-ips', '~> 2.3.0', require: false - - gem 'knapsack', '~> 1.21.1' - gem 'crystalball', '~> 0.7.0', require: false - - gem 'simple_po_parser', '~> 1.1.6', require: false - - gem 'timecop', '~> 0.9.1' - - gem 'png_quantizator', '~> 0.2.1', require: false - - gem 'parallel', '~> 1.19', require: false - - gem 'test_file_finder', '~> 0.1.3' - - gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup' -end - + group :development, :test, :danger do + gem 'gitlab-dangerfiles', '~> 3.0', require: false + end + -group :development, :test, :coverage do - gem 'simplecov', '~> 0.21', require: false - gem 'simplecov-lcov', '~> 0.8.0', require: false - gem 'simplecov-cobertura', '~> 1.3.1', require: false - gem 'undercover', '~> 0.4.4', require: false -end - # Gems required in omnibus-gitlab pipeline group :development, :test, :omnibus do # Using a fork until https://github.com/pivotal/LicenseFinder/pull/816 is -@@ -423,30 +351,6 @@ group :development, :test, :omnibus do +@@ -423,30 +355,6 @@ group :development, :test, :omnibus do gem 'gitlab-license_finder', '~> 6.0', require: false end -group :test do - gem 'fuubar', '~> 2.2.0' - gem 'rspec-retry', '~> 0.6.1' - gem 'rspec_profiling', '~> 0.0.6' - gem 'rspec-benchmark', '~> 0.6.0' - gem 'rspec-parameterized', require: false - - gem 'capybara', '~> 3.35.3' - gem 'capybara-screenshot', '~> 1.0.22' - gem 'selenium-webdriver', '~> 3.142' - - gem 'shoulda-matchers', '~> 4.0.1', require: false - gem 'email_spec', '~> 2.2.0' - gem 'webmock', '~> 3.9.1' - gem 'rails-controller-testing' - gem 'concurrent-ruby', '~> 1.1' - gem 'test-prof', '~> 1.0.7' - gem 'rspec_junit_formatter' - gem 'guard-rspec' - - # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 - gem 'derailed_benchmarks', require: false -end - gem 'octokit', '~> 4.15' # Updating this gem version here is deprecated. See: -@@ -545,3 +449,7 @@ gem 'ipaddress', '~> 0.8.3' +@@ -545,3 +453,6 @@ gem 'ipaddress', '~> 0.8.3' gem 'parslet', '~> 1.8' gem 'ipynbdiff', '0.4.7' + +gem 'parser' -+gem 'gitlab-dangerfiles' +