projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '18318-nokogiri-updates' into main. Closes #18318
[arvados.git]
/
services
/
api
/
Gemfile
diff --git
a/services/api/Gemfile
b/services/api/Gemfile
index 18797d69c68e6fc0d9d39550a86c3a2ba916cb24..39ce5def17e0feddaafc04a91c7a1bfeadd997a6 100644
(file)
--- a/
services/api/Gemfile
+++ b/
services/api/Gemfile
@@
-4,12
+4,11
@@
source 'https://rubygems.org'
source 'https://rubygems.org'
-gem 'rails', '~> 5.
0
.0'
+gem 'rails', '~> 5.
2
.0'
gem 'responders', '~> 2.0'
group :test, :development do
gem 'factory_bot_rails'
gem 'responders', '~> 2.0'
group :test, :development do
gem 'factory_bot_rails'
- gem 'database_cleaner'
# 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
# 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
@@
-23,6
+22,7
@@
group :test, :development do
gem 'simplecov-rcov', require: false
gem 'mocha', require: false
gem 'byebug'
gem 'simplecov-rcov', require: false
gem 'mocha', require: false
gem 'byebug'
+ gem 'listen'
end
gem 'pg', '~> 1.0'
end
gem 'pg', '~> 1.0'
@@
-44,18
+44,14
@@
gem 'passenger'
# Locking to 5.10.3 to workaround issue in 5.11.1 (https://github.com/seattlerb/minitest/issues/730)
gem 'minitest', '5.10.3'
# Locking to 5.10.3 to workaround issue in 5.11.1 (https://github.com/seattlerb/minitest/issues/730)
gem 'minitest', '5.10.3'
-# Restricted because omniauth >= 1.5.0 requires Ruby >= 2.1.9:
-gem 'omniauth', '~> 1.4.0'
-gem 'omniauth-oauth2', '~> 1.1'
-
gem 'andand'
gem 'optimist'
gem 'themes_for_rails', git: 'https://github.com/arvados/themes_for_rails'
gem 'andand'
gem 'optimist'
gem 'themes_for_rails', git: 'https://github.com/arvados/themes_for_rails'
-# Import arvados gem.
Note: actual git commit is pinned via Gemfile.lock
-gem 'arvados',
git: 'https://github.com/arvados/arvados.git', glob: 'sdk/ruby/arvados.gemspec
'
+# Import arvados gem.
+gem 'arvados',
'~> 2.1.5
'
gem 'httpclient'
gem 'sshkey'
gem 'httpclient'
gem 'sshkey'