projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '20300-rails7'
[arvados.git]
/
services
/
api
/
Gemfile
diff --git
a/services/api/Gemfile
b/services/api/Gemfile
index 3abc1d3b2809db4253481db1ecdb301946f8d7a9..dafb0d380174671774df5cf22e40485d7b6b872c 100644
(file)
--- a/
services/api/Gemfile
+++ b/
services/api/Gemfile
@@
-4,12
+4,10
@@
source 'https://rubygems.org'
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'
group :test, :development do
gem 'factory_bot_rails'
@@
-49,11
+47,9
@@
gem 'optimist'
gem 'themes_for_rails', git: 'https://github.com/arvados/themes_for_rails'
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 'httpclient'
-gem 'safe_yaml'
gem 'lograge'
gem 'logstash-event'
gem 'lograge'
gem 'logstash-event'
@@
-62,9
+58,7
@@
gem 'rails-observers'
gem 'rails-perftest'
gem 'rails-controller-testing'
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 'mini_portile2', '~> 2.8', '>= 2.8.1'
# Install any plugin gems
Dir.glob(File.join(File.dirname(__FILE__), 'lib', '**', "Gemfile")) do |f|
# Install any plugin gems
Dir.glob(File.join(File.dirname(__FILE__), 'lib', '**', "Gemfile")) do |f|