projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
13100: Merge branch 'master' into 13100-crunch-run-output
[arvados.git]
/
services
/
api
/
Gemfile.lock
diff --git
a/services/api/Gemfile.lock
b/services/api/Gemfile.lock
index 91a9d04e4ebe26b48b4a85c88a8c40fa1d9ad826..30cd8a559fb5c0d58177f59907edf7e0c716ac6f 100644
(file)
--- a/
services/api/Gemfile.lock
+++ b/
services/api/Gemfile.lock
@@
-8,57
+8,57
@@
GIT
GEM
remote: https://rubygems.org/
specs:
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.
10
)
+ actionpack (= 4.2.
10
)
+ actionview (= 4.2.
10
)
+ activejob (= 4.2.
10
)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
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.
10
)
+ actionview (= 4.2.
10
)
+ activesupport (= 4.2.
10
)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
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.
10
)
+ activesupport (= 4.2.
10
)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
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
)
+ rails-html-sanitizer (~> 1.0, >= 1.0.
3
)
+ activejob (4.2.
10
)
+ activesupport (= 4.2.
10
)
globalid (>= 0.3.0)
globalid (>= 0.3.0)
- activemodel (4.2.
5.2
)
- activesupport (= 4.2.
5.2
)
+ activemodel (4.2.
10
)
+ activesupport (= 4.2.
10
)
builder (~> 3.1)
builder (~> 3.1)
- activerecord (4.2.
5.2
)
- activemodel (= 4.2.
5.2
)
- activesupport (= 4.2.
5.2
)
+ activerecord (4.2.
10
)
+ activemodel (= 4.2.
10
)
+ activesupport (= 4.2.
10
)
arel (~> 6.0)
arel (~> 6.0)
- activesupport (4.2.5.2)
+ activerecord-deprecated_finders (1.0.4)
+ activesupport (4.2.10)
i18n (~> 0.7)
i18n (~> 0.7)
- json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
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)
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)
andand (1.3.3)
arel (6.0.4)
- arvados (0.1.201
70629115132
)
- activesupport (>= 3
, < 4.2.6
)
+ arvados (0.1.201
80302192246
)
+ activesupport (>= 3)
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)
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.2017
0817171636
)
+ arvados-cli (0.1.2017
1211220040
)
activesupport (>= 3.2.13, < 5)
andand (~> 1.3, >= 1.3.3)
arvados (~> 0.1, >= 0.1.20150128223554)
activesupport (>= 3.2.13, < 5)
andand (~> 1.3, >= 1.3.3)
arvados (~> 0.1, >= 0.1.20150128223554)
@@
-78,33
+78,33
@@
GEM
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
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)
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)
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)
erubis (2.7.0)
- eventmachine (1.2.
3
)
+ eventmachine (1.2.
5
)
execjs (2.7.0)
extlib (0.9.16)
execjs (2.7.0)
extlib (0.9.16)
- factory_girl (4.
8
.0)
+ factory_girl (4.
9
.0)
activesupport (>= 3.0.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)
railties (>= 3.0.0)
- faraday (0.1
1.0
)
+ faraday (0.1
2.2
)
multipart-post (>= 1.2, < 3)
faye-websocket (0.10.7)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
multipart-post (>= 1.2, < 3)
faye-websocket (0.10.7)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
- globalid (0.
3.7
)
- activesupport (>= 4.
1
.0)
+ globalid (0.
4.1
)
+ activesupport (>= 4.
2
.0)
google-api-client (0.8.7)
activesupport (>= 3.2, < 5.0)
addressable (~> 2.3)
google-api-client (0.8.7)
activesupport (>= 3.2, < 5.0)
addressable (~> 2.3)
@@
-116,24
+116,25
@@
GEM
multi_json (~> 1.10)
retriable (~> 1.4)
signet (~> 0.6)
multi_json (~> 1.10)
retriable (~> 1.4)
signet (~> 0.6)
- googleauth (0.
5.1
)
- faraday (~> 0.
9
)
- jwt (
~> 1.4
)
+ googleauth (0.
6.2
)
+ faraday (~> 0.
12
)
+ jwt (
>= 1.4, < 3.0
)
logging (~> 2.0)
memoist (~> 0.12)
multi_json (~> 1.11)
os (~> 0.9)
signet (~> 0.7)
logging (~> 2.0)
memoist (~> 0.12)
multi_json (~> 1.11)
os (~> 0.9)
signet (~> 0.7)
- hashie (3.5.
5
)
- highline (1.7.
8
)
+ hashie (3.5.
7
)
+ highline (1.7.
10
)
hike (1.2.3)
hike (1.2.3)
- i18n (0.9.0)
+ httpclient (2.8.3)
+ i18n (0.9.5)
concurrent-ruby (~> 1.0)
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)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
- json (
1.8.6
)
+ json (
2.1.0
)
jwt (1.5.6)
launchy (2.4.3)
addressable (~> 2.3)
jwt (1.5.6)
launchy (2.4.3)
addressable (~> 2.3)
@@
-142,97
+143,97
@@
GEM
logging (2.2.2)
little-plugger (~> 1.1)
multi_json (~> 1.10)
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)
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)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
- mail (2.
6.4
)
- mi
me-types (>= 1.16, < 4
)
+ mail (2.
7.0
)
+ mi
ni_mime (>= 0.1.1
)
memoist (0.16.0)
metaclass (0.0.4)
memoist (0.16.0)
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)
mini_portile2 (2.3.0)
- minitest (5.1
0
.3)
- mocha (1.
2.1
)
+ minitest (5.1
1
.3)
+ mocha (1.
3.0
)
metaclass (~> 0.0.1)
metaclass (~> 0.0.1)
- multi_json (1.1
2
.1)
+ multi_json (1.1
3
.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
multi_xml (0.6.0)
multipart-post (2.0.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)
net-ssh-gateway (2.0.0)
net-ssh (>= 4.0.0)
- nokogiri (1.8.
1
)
+ nokogiri (1.8.
2
)
mini_portile2 (~> 2.3.0)
mini_portile2 (~> 2.3.0)
- oauth2 (1.
3.1
)
- faraday (>= 0.8, < 0.1
2
)
+ oauth2 (1.
4.0
)
+ faraday (>= 0.8, < 0.1
3
)
jwt (~> 1.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
oj (2.18.5)
oj_mimic_json (1.0.1)
jwt (~> 1.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
oj (2.18.5)
oj_mimic_json (1.0.1)
- omniauth (1.4.
2
)
+ omniauth (1.4.
3
)
hashie (>= 1.2, < 4)
hashie (>= 1.2, < 4)
- rack (>= 1.
0
, < 3)
- omniauth-oauth2 (1.
4
.0)
- oauth2 (~> 1.
0
)
+ rack (>= 1.
6.2
, < 3)
+ omniauth-oauth2 (1.
5
.0)
+ oauth2 (~> 1.
1
)
omniauth (~> 1.2)
os (0.9.6)
omniauth (~> 1.2)
os (0.9.6)
- passenger (5.
1.2
)
+ passenger (5.
2.1
)
rack
rake (>= 0.8.1)
rack
rake (>= 0.8.1)
- pg (0.2
0
.0)
- power_assert (1.
0
.1)
- protected_attributes (1.1.
3
)
+ pg (0.2
1
.0)
+ power_assert (1.
1
.1)
+ protected_attributes (1.1.
4
)
activemodel (>= 4.0.1, < 5.0)
activemodel (>= 4.0.1, < 5.0)
- public_suffix (
2.0.5
)
- rack (1.6.
8
)
+ public_suffix (
3.0.2
)
+ rack (1.6.
9
)
rack-test (0.6.3)
rack (>= 1.0)
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.
10
)
+ actionmailer (= 4.2.
10
)
+ actionpack (= 4.2.
10
)
+ actionview (= 4.2.
10
)
+ activejob (= 4.2.
10
)
+ activemodel (= 4.2.
10
)
+ activerecord (= 4.2.
10
)
+ activesupport (= 4.2.
10
)
bundler (>= 1.3.0, < 2.0)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.2.
5.2
)
+ railties (= 4.2.
10
)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
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)
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.
10
)
+ actionpack (= 4.2.
10
)
+ activesupport (= 4.2.
10
)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
- rake (12.
2.1
)
+ rake (12.
3.0
)
ref (2.0.0)
ref (2.0.0)
- request_store (1.3.2)
- responders (2.3.0)
- railties (>= 4.2.0, < 5.1)
+ request_store (1.4.0)
+ rack (>= 1.4)
+ responders (2.4.0)
+ actionpack (>= 4.2.0, < 5.3)
+ railties (>= 4.2.0, < 5.3)
retriable (1.4.1)
retriable (1.4.1)
- ruby-prof (0.1
6.2
)
+ ruby-prof (0.1
7.0
)
rvm-capistrano (1.5.6)
capistrano (~> 2.15.4)
safe_yaml (1.0.4)
rvm-capistrano (1.5.6)
capistrano (~> 2.15.4)
safe_yaml (1.0.4)
@@
-242,10
+243,10
@@
GEM
sass (~> 3.2.2)
sprockets (~> 2.8, < 3.0)
sprockets-rails (~> 2.0)
sass (~> 3.2.2)
sprockets (~> 2.8, < 3.0)
sprockets-rails (~> 2.0)
- signet (0.
7.3
)
+ signet (0.
8.1
)
addressable (~> 2.3)
faraday (~> 0.9)
addressable (~> 2.3)
faraday (~> 0.9)
- jwt (
~> 1.5
)
+ jwt (
>= 1.5, < 3.0
)
multi_json (~> 1.10)
simplecov (0.7.1)
multi_json (~> 1.0)
multi_json (~> 1.10)
simplecov (0.7.1)
multi_json (~> 1.0)
@@
-263,7
+264,7
@@
GEM
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sshkey (1.9.0)
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)
power_assert
test_after_commit (1.1.0)
activerecord (>= 3.2)
@@
-274,19
+275,20
@@
GEM
thread_safe (0.3.6)
tilt (1.4.1)
trollop (2.1.2)
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)
thread_safe (~> 0.1)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
- websocket-driver (0.
6.5
)
+ websocket-driver (0.
7.0
)
websocket-extensions (>= 0.1.0)
websocket-extensions (>= 0.1.0)
- websocket-extensions (0.1.
2
)
+ websocket-extensions (0.1.
3
)
PLATFORMS
ruby
DEPENDENCIES
PLATFORMS
ruby
DEPENDENCIES
+ activerecord-deprecated_finders
acts_as_api
andand
arvados (>= 0.1.20150615153458)
acts_as_api
andand
arvados (>= 0.1.20150615153458)
@@
-295,6
+297,7
@@
DEPENDENCIES
database_cleaner
factory_girl_rails
faye-websocket
database_cleaner
factory_girl_rails
faye-websocket
+ httpclient
jquery-rails
lograge
logstash-event
jquery-rails
lograge
logstash-event
@@
-305,9
+308,9
@@
DEPENDENCIES
omniauth (~> 1.4.0)
omniauth-oauth2 (~> 1.1)
passenger
omniauth (~> 1.4.0)
omniauth-oauth2 (~> 1.1)
passenger
- pg
+ pg
(~> 0.18)
protected_attributes
protected_attributes
- rails (~> 4.
0
)
+ rails (~> 4.
2
)
rails-observers
responders (~> 2.0)
ruby-prof
rails-observers
responders (~> 2.0)
ruby-prof
@@
-325,4
+328,4
@@
DEPENDENCIES
uglifier (~> 2.0)
BUNDLED WITH
uglifier (~> 2.0)
BUNDLED WITH
- 1.16.
0
+ 1.16.
1