Merge branch '21383-misc-fixes'. Refs #21383

[arvados.git] / services / api / Gemfile

diff --git a/services/api/Gemfile b/services/api/Gemfile
index 3abc1d3b2809db4253481db1ecdb301946f8d7a9..9cc5f1b7bc175c421eb18a12ed41052ade1928c1 100644 (file)
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -4,25 +4,19 @@
 
 source 'https://rubygems.org'
 
-gem 'rails', '~> 5.2.0'
-gem 'responders', '~> 2.0'
-
-# Pin sprockets to < 4.0 to avoid issues when upgrading rails to 5.2
-# See: https://github.com/rails/sprockets-rails/issues/443
-gem 'sprockets', '~> 3.0'
+gem 'rails', '~> 7.0.0'
+gem 'responders'
+gem 'i18n'
+gem 'sprockets-rails'
 
 group :test, :development do
   gem 'factory_bot_rails'
-
-  # As of now (2019-03-27) There's an open issue about incompatibilities with
-  # newer versions of this gem: https://github.com/rails/rails-perftest/issues/38
-  gem 'ruby-prof', '~> 0.15.0'
-
+  gem 'ruby-prof'
   # Note: "require: false" here tells bunder not to automatically
   # 'require' the packages during application startup. Installation is
   # still mandatory.
-  gem 'test-unit', '~> 3.0', require: false
-  gem 'simplecov', '~> 0.7.1', require: false
+  gem 'test-unit', require: false
+  gem 'simplecov', require: false
   gem 'simplecov-rcov', require: false
   gem 'mocha', require: false
   gem 'byebug'
@@ -49,11 +43,9 @@ gem 'optimist'
 
 gem 'themes_for_rails', git: 'https://github.com/arvados/themes_for_rails'
 
-# Import arvados gem.
-gem 'arvados', '~> 2.1.5'
+gem 'arvados', '~> 2.7.0.rc1'
 gem 'httpclient'
 
-gem 'safe_yaml'
 gem 'lograge'
 gem 'logstash-event'
 
@@ -62,9 +54,9 @@ gem 'rails-observers'
 gem 'rails-perftest'
 gem 'rails-controller-testing'
 
-# arvados-google-api-client and googleauth depend on signet, but
-# signet 0.12 is incompatible with ruby 2.3.
-gem 'signet', '< 0.12'
+gem 'webrick'
+
+gem 'mini_portile2', '~> 2.8', '>= 2.8.1'
 
 # Install any plugin gems
 Dir.glob(File.join(File.dirname(__FILE__), 'lib', '**', "Gemfile")) do |f|