projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '17004-properties-on-output' refs #17004
[arvados.git]
/
services
/
api
/
Gemfile
diff --git
a/services/api/Gemfile
b/services/api/Gemfile
index 7fc7f8757c690fc7aed031b7b40977ec1ef1bc38..30d877fac7265c6ee76eead4d0e96c9ffc6d6629 100644
(file)
--- a/
services/api/Gemfile
+++ b/
services/api/Gemfile
@@
-30,13
+30,8
@@
gem 'pg', '~> 1.0'
gem 'multi_json'
gem 'oj'
gem 'multi_json'
gem 'oj'
-gem 'therubyracer'
-gem 'uglifier', '~> 2.0'
-
gem 'jquery-rails'
gem 'jquery-rails'
-gem 'rvm-capistrano', :group => :test
-
gem 'acts_as_api'
gem 'passenger'
gem 'acts_as_api'
gem 'passenger'
@@
-44,10
+39,6
@@
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 'andand'
gem 'optimist'
@@
-68,8
+59,6
@@
gem 'rails-observers'
gem 'rails-perftest'
gem 'rails-controller-testing'
gem 'rails-perftest'
gem 'rails-controller-testing'
-gem 'sass-rails'
-
# arvados-google-api-client and googleauth depend on signet, but
# signet 0.12 is incompatible with ruby 2.3.
gem 'signet', '< 0.12'
# arvados-google-api-client and googleauth depend on signet, but
# signet 0.12 is incompatible with ruby 2.3.
gem 'signet', '< 0.12'