X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/644f5de63e2b8b02e054fcbb3e9af39560cffae3..aeb966ee09166bf074ea19a4a2dd5045ca795a98:/services/api/Gemfile diff --git a/services/api/Gemfile b/services/api/Gemfile index 4cb5671e18..c91495d8f5 100644 --- a/services/api/Gemfile +++ b/services/api/Gemfile @@ -4,12 +4,11 @@ source 'https://rubygems.org' -gem 'rails', '~> 4.0' +gem 'rails', '~> 4.2' gem 'responders', '~> 2.0' -gem 'protected_attributes' group :test, :development do - gem 'factory_girl_rails' + gem 'factory_bot_rails' gem 'database_cleaner' gem 'ruby-prof' # Note: "require: false" here tells bunder not to automatically @@ -21,12 +20,16 @@ group :test, :development do gem 'mocha', require: false end +# We need this dependency because of crunchv1 +gem 'arvados-cli' + # pg is the only supported database driver. -gem 'pg' +# Note: Rails 4.2 is not compatible with pg 1.0 +# (See: https://github.com/rails/rails/pull/31671) +gem 'pg', '~> 0.18' gem 'multi_json' gem 'oj' -gem 'oj_mimic_json' # for building assets gem 'sass-rails', '~> 4.0' @@ -55,8 +58,7 @@ gem 'faye-websocket' gem 'themes_for_rails', git: 'https://github.com/curoverse/themes_for_rails' -gem 'arvados', '>= 0.1.20150615153458' -gem 'arvados-cli', '>= 0.1.20161017193526' +gem 'arvados', '>= 1.3.1.20190301212059' gem 'httpclient' gem 'sshkey'