X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b212abf2074b52057f9c1dbf8ad9cef77b2ca8ce..09a2e88c51e5432e607f2a38466e55b4ba15e887:/services/api/Gemfile diff --git a/services/api/Gemfile b/services/api/Gemfile index 1193e91536..7be039e8a3 100644 --- a/services/api/Gemfile +++ b/services/api/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '~> 3.2.0' +gem 'rails', '~> 3.2' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' @@ -12,14 +12,15 @@ group :test, :development do # 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 'minitest-rails', require: false + gem 'minitest', '~> 4.0', require: false gem 'simplecov', '~> 0.7.1', require: false gem 'simplecov-rcov', require: false gem 'mocha', require: false end -# This might not be needed in :test and :development, but we load it -# anyway to make sure it always gets in Gemfile.lock and to help -# reveal install problems sooner rather than later. +# pg is the only supported database driver. gem 'pg' # Start using multi_json once we are on Rails 3.2; @@ -31,13 +32,13 @@ gem 'oj' # Gems used only for assets and not required # in production environments by default. group :assets do - gem 'sass-rails', '>= 3.2.0' - gem 'coffee-rails', '~> 3.2.0' + gem 'sass-rails', '~> 3.2' + gem 'coffee-rails', '~> 3.2' # See https://github.com/sstephenson/execjs#readme for more supported runtimes gem 'therubyracer' - gem 'uglifier', '>= 1.0.3' + gem 'uglifier', '~> 2.0' end gem 'jquery-rails' @@ -60,24 +61,26 @@ gem 'acts_as_api' gem 'passenger' -gem 'omniauth', '1.1.1' -gem 'omniauth-oauth2', '1.1.1' +gem 'omniauth', '~> 1.1' +gem 'omniauth-oauth2', '~> 1.1' gem 'andand' gem 'test_after_commit', :group => :test -gem 'google-api-client', '~> 0.6.3' gem 'trollop' gem 'faye-websocket' gem 'themes_for_rails' gem 'arvados', '>= 0.1.20150615153458' -gem 'arvados-cli', '>= 0.1.20150605170031' +gem 'arvados-cli', '>= 0.1.20161017193526' # pg_power lets us use partial indexes in schema.rb in Rails 3 gem 'pg_power' -gem 'puma' +gem 'puma', '~> 2.0' gem 'sshkey' +gem 'safe_yaml' +gem 'lograge' +gem 'logstash-event'