[ARVADOS] created: 1.1.3-77-g5a5ced3
Git user
git at public.curoverse.com
Tue Feb 20 14:16:54 EST 2018
at 5a5ced3839f904c631f3bf54a56a7f8de064c118 (commit)
commit 5a5ced3839f904c631f3bf54a56a7f8de064c118
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date: Tue Feb 20 16:16:09 2018 -0300
12737: Updates API server rails to version 4.2.7.1
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>
diff --git a/services/api/Gemfile b/services/api/Gemfile
index 4cb5671..a58afcb 100644
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -4,7 +4,7 @@
source 'https://rubygems.org'
-gem 'rails', '~> 4.0'
+gem 'rails', '4.2.7.1'
gem 'responders', '~> 2.0'
gem 'protected_attributes'
@@ -21,8 +21,12 @@ group :test, :development do
gem 'mocha', require: false
end
+# We'll need to update related code prior to Rails 5.
+# See: https://github.com/rails/activerecord-deprecated_finders
+gem 'activerecord-deprecated_finders', require: 'active_record/deprecated_finders'
+
# pg is the only supported database driver.
-gem 'pg'
+gem 'pg', '~> 0.18'
gem 'multi_json'
gem 'oj'
diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index b2de3f5..4c2d120 100644
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -8,57 +8,57 @@ GIT
GEM
remote: https://rubygems.org/
specs:
- actionmailer (4.2.5.2)
- actionpack (= 4.2.5.2)
- actionview (= 4.2.5.2)
- activejob (= 4.2.5.2)
+ actionmailer (4.2.7.1)
+ actionpack (= 4.2.7.1)
+ actionview (= 4.2.7.1)
+ activejob (= 4.2.7.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
- actionpack (4.2.5.2)
- actionview (= 4.2.5.2)
- activesupport (= 4.2.5.2)
+ actionpack (4.2.7.1)
+ actionview (= 4.2.7.1)
+ activesupport (= 4.2.7.1)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionview (4.2.5.2)
- activesupport (= 4.2.5.2)
+ actionview (4.2.7.1)
+ activesupport (= 4.2.7.1)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- activejob (4.2.5.2)
- activesupport (= 4.2.5.2)
+ activejob (4.2.7.1)
+ activesupport (= 4.2.7.1)
globalid (>= 0.3.0)
- activemodel (4.2.5.2)
- activesupport (= 4.2.5.2)
+ activemodel (4.2.7.1)
+ activesupport (= 4.2.7.1)
builder (~> 3.1)
- activerecord (4.2.5.2)
- activemodel (= 4.2.5.2)
- activesupport (= 4.2.5.2)
+ activerecord (4.2.7.1)
+ activemodel (= 4.2.7.1)
+ activesupport (= 4.2.7.1)
arel (~> 6.0)
- activesupport (4.2.5.2)
+ activerecord-deprecated_finders (1.0.4)
+ activesupport (4.2.7.1)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
- acts_as_api (1.0.0)
+ acts_as_api (1.0.1)
activemodel (>= 3.0.0)
activesupport (>= 3.0.0)
rack (>= 1.1.0)
- addressable (2.5.1)
- public_suffix (~> 2.0, >= 2.0.2)
+ addressable (2.5.2)
+ public_suffix (>= 2.0.2, < 4.0)
andand (1.3.3)
arel (6.0.4)
- arvados (0.1.20170629115132)
- activesupport (>= 3, < 4.2.6)
+ arvados (0.1.20151207150126)
+ activesupport (>= 3.2.13)
andand (~> 1.3, >= 1.3.3)
- google-api-client (>= 0.7, < 0.8.9)
- i18n (~> 0)
- json (>= 1.7.7, < 3)
- jwt (>= 0.1.5, < 2)
- arvados-cli (0.1.20170817171636)
+ google-api-client (~> 0.6.3, >= 0.6.3)
+ json (~> 1.7, >= 1.7.7)
+ jwt (>= 0.1.5, < 1.0.0)
+ arvados-cli (0.1.20171211220040)
activesupport (>= 3.2.13, < 5)
andand (~> 1.3, >= 1.3.3)
arvados (~> 0.1, >= 0.1.20150128223554)
@@ -78,162 +78,149 @@ GEM
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
- coffee-rails (4.2.1)
+ coffee-rails (4.2.2)
coffee-script (>= 2.2.0)
- railties (>= 4.0.0, < 5.2.x)
+ railties (>= 4.0.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.0.5)
- crass (1.0.2)
- curb (0.9.3)
- database_cleaner (1.5.3)
+ crass (1.0.3)
+ curb (0.9.4)
+ database_cleaner (1.6.2)
erubis (2.7.0)
- eventmachine (1.2.3)
+ eventmachine (1.2.5)
execjs (2.7.0)
extlib (0.9.16)
- factory_girl (4.8.0)
+ factory_girl (4.9.0)
activesupport (>= 3.0.0)
- factory_girl_rails (4.8.0)
- factory_girl (~> 4.8.0)
+ factory_girl_rails (4.9.0)
+ factory_girl (~> 4.9.0)
railties (>= 3.0.0)
- faraday (0.11.0)
- multipart-post (>= 1.2, < 3)
+ faraday (0.8.11)
+ multipart-post (~> 1.2.0)
faye-websocket (0.10.7)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
- globalid (0.3.7)
- activesupport (>= 4.1.0)
- google-api-client (0.8.7)
- activesupport (>= 3.2, < 5.0)
- addressable (~> 2.3)
- autoparse (~> 0.3)
- extlib (~> 0.9)
- faraday (~> 0.9)
- googleauth (~> 0.3)
- launchy (~> 2.4)
- multi_json (~> 1.10)
- retriable (~> 1.4)
- signet (~> 0.6)
- googleauth (0.5.1)
- faraday (~> 0.9)
- jwt (~> 1.4)
- logging (~> 2.0)
- memoist (~> 0.12)
- multi_json (~> 1.11)
- os (~> 0.9)
- signet (~> 0.7)
- hashie (3.5.5)
- highline (1.7.8)
+ globalid (0.4.1)
+ activesupport (>= 4.2.0)
+ google-api-client (0.6.4)
+ addressable (>= 2.3.2)
+ autoparse (>= 0.3.3)
+ extlib (>= 0.9.15)
+ faraday (~> 0.8.4)
+ jwt (>= 0.1.5)
+ launchy (>= 2.1.1)
+ multi_json (>= 1.0.0)
+ signet (~> 0.4.5)
+ uuidtools (>= 2.1.0)
+ hashie (3.5.7)
+ highline (1.7.10)
hike (1.2.3)
httpclient (2.8.3)
- i18n (0.9.0)
+ i18n (0.9.5)
concurrent-ruby (~> 1.0)
- jquery-rails (4.2.2)
+ jquery-rails (4.3.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.6)
- jwt (1.5.6)
+ jwt (0.1.13)
+ multi_json (>= 1.5)
launchy (2.4.3)
addressable (~> 2.3)
libv8 (3.16.14.19)
- little-plugger (1.1.4)
- logging (2.2.2)
- little-plugger (~> 1.1)
- multi_json (~> 1.10)
- lograge (0.7.1)
- actionpack (>= 4, < 5.2)
- activesupport (>= 4, < 5.2)
- railties (>= 4, < 5.2)
+ lograge (0.9.0)
+ actionpack (>= 4)
+ activesupport (>= 4)
+ railties (>= 4)
request_store (~> 1.0)
logstash-event (1.2.02)
- loofah (2.1.1)
+ loofah (2.2.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
- mail (2.6.4)
- mime-types (>= 1.16, < 4)
- memoist (0.16.0)
+ mail (2.7.0)
+ mini_mime (>= 0.1.1)
metaclass (0.0.4)
- mime-types (3.1)
- mime-types-data (~> 3.2015)
- mime-types-data (3.2016.0521)
+ mini_mime (1.0.0)
mini_portile2 (2.3.0)
- minitest (5.10.3)
- mocha (1.2.1)
+ minitest (5.11.3)
+ mocha (1.3.0)
metaclass (~> 0.0.1)
- multi_json (1.12.1)
+ multi_json (1.13.1)
multi_xml (0.6.0)
- multipart-post (2.0.0)
+ multipart-post (1.2.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
- net-ssh (4.1.0)
+ net-ssh (4.2.0)
net-ssh-gateway (2.0.0)
net-ssh (>= 4.0.0)
- nokogiri (1.8.1)
+ nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
- oauth2 (1.3.1)
- faraday (>= 0.8, < 0.12)
- jwt (~> 1.0)
+ oauth2 (0.9.3)
+ faraday (>= 0.8, < 0.10)
+ jwt (~> 0.1.8)
multi_json (~> 1.3)
multi_xml (~> 0.5)
- rack (>= 1.2, < 3)
+ rack (~> 1.2)
oj (2.18.5)
oj_mimic_json (1.0.1)
- omniauth (1.4.2)
+ omniauth (1.4.3)
hashie (>= 1.2, < 4)
- rack (>= 1.0, < 3)
- omniauth-oauth2 (1.4.0)
- oauth2 (~> 1.0)
+ rack (>= 1.6.2, < 3)
+ omniauth-oauth2 (1.1.2)
+ faraday (>= 0.8, < 0.10)
+ multi_json (~> 1.3)
+ oauth2 (~> 0.9.3)
omniauth (~> 1.2)
- os (0.9.6)
- passenger (5.1.2)
+ passenger (5.2.0)
rack
rake (>= 0.8.1)
- pg (0.20.0)
- power_assert (1.0.1)
- protected_attributes (1.1.3)
+ pg (0.21.0)
+ power_assert (1.1.1)
+ protected_attributes (1.1.4)
activemodel (>= 4.0.1, < 5.0)
- public_suffix (2.0.5)
+ public_suffix (3.0.2)
rack (1.6.8)
rack-test (0.6.3)
rack (>= 1.0)
- rails (4.2.5.2)
- actionmailer (= 4.2.5.2)
- actionpack (= 4.2.5.2)
- actionview (= 4.2.5.2)
- activejob (= 4.2.5.2)
- activemodel (= 4.2.5.2)
- activerecord (= 4.2.5.2)
- activesupport (= 4.2.5.2)
+ rails (4.2.7.1)
+ actionmailer (= 4.2.7.1)
+ actionpack (= 4.2.7.1)
+ actionview (= 4.2.7.1)
+ activejob (= 4.2.7.1)
+ activemodel (= 4.2.7.1)
+ activerecord (= 4.2.7.1)
+ activesupport (= 4.2.7.1)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.2.5.2)
+ railties (= 4.2.7.1)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
- rails-dom-testing (1.0.8)
- activesupport (>= 4.2.0.beta, < 5.0)
+ rails-dom-testing (1.0.9)
+ activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
- rails-observers (0.1.2)
- activemodel (~> 4.0)
- railties (4.2.5.2)
- actionpack (= 4.2.5.2)
- activesupport (= 4.2.5.2)
+ rails-observers (0.1.5)
+ activemodel (>= 4.0)
+ railties (4.2.7.1)
+ actionpack (= 4.2.7.1)
+ activesupport (= 4.2.7.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
- rake (12.2.1)
+ rake (12.3.0)
ref (2.0.0)
- request_store (1.3.2)
- responders (2.3.0)
- railties (>= 4.2.0, < 5.1)
- retriable (1.4.1)
- ruby-prof (0.16.2)
+ request_store (1.4.0)
+ rack (>= 1.4)
+ responders (2.4.0)
+ actionpack (>= 4.2.0, < 5.3)
+ railties (>= 4.2.0, < 5.3)
+ ruby-prof (0.17.0)
rvm-capistrano (1.5.6)
capistrano (~> 2.15.4)
safe_yaml (1.0.4)
@@ -243,11 +230,11 @@ GEM
sass (~> 3.2.2)
sprockets (~> 2.8, < 3.0)
sprockets-rails (~> 2.0)
- signet (0.7.3)
- addressable (~> 2.3)
- faraday (~> 0.9)
- jwt (~> 1.5)
- multi_json (~> 1.10)
+ signet (0.4.5)
+ addressable (>= 2.2.3)
+ faraday (~> 0.8.1)
+ jwt (>= 0.1.5)
+ multi_json (>= 1.0.0)
simplecov (0.7.1)
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
@@ -264,7 +251,7 @@ GEM
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sshkey (1.9.0)
- test-unit (3.2.3)
+ test-unit (3.2.7)
power_assert
test_after_commit (1.1.0)
activerecord (>= 3.2)
@@ -275,19 +262,21 @@ GEM
thread_safe (0.3.6)
tilt (1.4.1)
trollop (2.1.2)
- tzinfo (1.2.4)
+ tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
- websocket-driver (0.6.5)
+ uuidtools (2.1.5)
+ websocket-driver (0.7.0)
websocket-extensions (>= 0.1.0)
- websocket-extensions (0.1.2)
+ websocket-extensions (0.1.3)
PLATFORMS
ruby
DEPENDENCIES
+ activerecord-deprecated_finders
acts_as_api
andand
arvados (>= 0.1.20150615153458)
@@ -307,9 +296,9 @@ DEPENDENCIES
omniauth (~> 1.4.0)
omniauth-oauth2 (~> 1.1)
passenger
- pg
+ pg (~> 0.18)
protected_attributes
- rails (~> 4.0)
+ rails (= 4.2.7.1)
rails-observers
responders (~> 2.0)
ruby-prof
@@ -327,4 +316,4 @@ DEPENDENCIES
uglifier (~> 2.0)
BUNDLED WITH
- 1.16.0
+ 1.16.1
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list