projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '10655-arvbash' closes #10655
[arvados.git]
/
services
/
api
/
Gemfile.lock
diff --git
a/services/api/Gemfile.lock
b/services/api/Gemfile.lock
index ce31316188533c659e46f17d1325f9464352d1be..9c9c4ae9e58b3105c47aa5eb330e052b3747a19f 100644
(file)
--- a/
services/api/Gemfile.lock
+++ b/
services/api/Gemfile.lock
@@
-28,26
+28,26
@@
GEM
activesupport (3.2.22.5)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
activesupport (3.2.22.5)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
- acts_as_api (0.4.
2
)
+ acts_as_api (0.4.
3
)
activemodel (>= 3.0.0)
activesupport (>= 3.0.0)
rack (>= 1.1.0)
addressable (2.4.0)
andand (1.3.3)
arel (3.0.3)
activemodel (>= 3.0.0)
activesupport (>= 3.0.0)
rack (>= 1.1.0)
addressable (2.4.0)
andand (1.3.3)
arel (3.0.3)
- arvados (0.1.20160
420143004
)
+ arvados (0.1.20160
513152536
)
activesupport (>= 3, < 4.2.6)
andand (~> 1.3, >= 1.3.3)
activesupport (>= 3, < 4.2.6)
andand (~> 1.3, >= 1.3.3)
- google-api-client (>= 0.7, < 0.9)
+ google-api-client (>= 0.7, < 0.
8.
9)
i18n (~> 0)
json (~> 1.7, >= 1.7.7)
jwt (>= 0.1.5, < 2)
i18n (~> 0)
json (~> 1.7, >= 1.7.7)
jwt (>= 0.1.5, < 2)
- arvados-cli (0.1.2016
0503204200
)
+ arvados-cli (0.1.2016
1017193526
)
activesupport (~> 3.2, >= 3.2.13)
andand (~> 1.3, >= 1.3.3)
arvados (~> 0.1, >= 0.1.20150128223554)
curb (~> 0.8)
activesupport (~> 3.2, >= 3.2.13)
andand (~> 1.3, >= 1.3.3)
arvados (~> 0.1, >= 0.1.20150128223554)
curb (~> 0.8)
- google-api-client (~> 0.6, >= 0.6.3, < 0.9)
+ google-api-client (~> 0.6, >= 0.6.3, < 0.
8.
9)
json (~> 1.7, >= 1.7.7)
oj (~> 2.0, >= 2.0.3)
trollop (~> 2.0)
json (~> 1.7, >= 1.7.7)
oj (~> 2.0, >= 2.0.3)
trollop (~> 2.0)
@@
-56,62
+56,71
@@
GEM
extlib (>= 0.9.15)
multi_json (>= 1.0.0)
builder (3.0.4)
extlib (>= 0.9.15)
multi_json (>= 1.0.0)
builder (3.0.4)
- capistrano (2.15.
5
)
+ capistrano (2.15.
9
)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
- coffee-rails (3.2.
1
)
+ coffee-rails (3.2.
2
)
coffee-script (>= 2.2.0)
coffee-script (>= 2.2.0)
- railties (~> 3.2.0
.beta
)
- coffee-script (2.
2.0
)
+ railties (~> 3.2.0)
+ coffee-script (2.
4.1
)
coffee-script-source
execjs
coffee-script-source
execjs
- coffee-script-source (1.
7
.0)
+ coffee-script-source (1.
10
.0)
curb (0.9.3)
curb (0.9.3)
- daemon_controller (1.2.0)
- database_cleaner (1.2.0)
+ database_cleaner (1.5.3)
erubis (2.7.0)
eventmachine (1.2.0.1)
erubis (2.7.0)
eventmachine (1.2.0.1)
- execjs (2.
0.2
)
+ execjs (2.
7.0
)
extlib (0.9.16)
extlib (0.9.16)
- factory_girl (4.
4
.0)
+ factory_girl (4.
7
.0)
activesupport (>= 3.0.0)
activesupport (>= 3.0.0)
- factory_girl_rails (4.
4.1
)
- factory_girl (~> 4.
4
.0)
+ factory_girl_rails (4.
7.0
)
+ factory_girl (~> 4.
7
.0)
railties (>= 3.0.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
railties (>= 3.0.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
- faye-websocket (0.
7.2
)
+ faye-websocket (0.
10.4
)
eventmachine (>= 0.12.0)
eventmachine (>= 0.12.0)
- websocket-driver (>= 0.3.1)
- google-api-client (0.7.1)
- addressable (>= 2.3.2)
- autoparse (>= 0.3.3)
- extlib (>= 0.9.15)
- faraday (>= 0.9.0)
- jwt (>= 0.1.5)
- launchy (>= 2.1.1)
- multi_json (>= 1.0.0)
- retriable (>= 1.4)
- signet (>= 0.5.0)
- uuidtools (>= 2.1.0)
- hashie (1.2.0)
- highline (1.6.21)
+ websocket-driver (>= 0.5.1)
+ 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.4.6)
+ highline (1.7.8)
hike (1.2.3)
hike (1.2.3)
- httpauth (0.2.1)
i18n (0.7.0)
journey (1.0.4)
i18n (0.7.0)
journey (1.0.4)
- jquery-rails (3.1.
0
)
+ jquery-rails (3.1.
4
)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
- jwt (0.1.13)
- multi_json (>= 1.5)
+ jwt (1.5.6)
launchy (2.4.3)
addressable (~> 2.3)
launchy (2.4.3)
addressable (~> 2.3)
- libv8 (3.16.14.3)
+ libv8 (3.16.14.15)
+ little-plugger (1.1.4)
+ logging (2.1.0)
+ little-plugger (~> 1.1)
+ multi_json (~> 1.10)
lograge (0.3.6)
actionpack (>= 3)
activesupport (>= 3)
lograge (0.3.6)
actionpack (>= 3)
activesupport (>= 3)
@@
-120,44
+129,45
@@
GEM
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
+ memoist (0.15.0)
metaclass (0.0.4)
mime-types (1.25.1)
metaclass (0.0.4)
mime-types (1.25.1)
- mocha (1.
1
.0)
+ mocha (1.
2
.0)
metaclass (~> 0.0.1)
multi_json (1.12.1)
metaclass (~> 0.0.1)
multi_json (1.12.1)
+ multi_xml (0.5.5)
multipart-post (2.0.0)
multipart-post (2.0.0)
- net-scp (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 (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
- net-ssh (
2.8
.0)
+ net-ssh (
3.2
.0)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
- oauth2 (
0.8.1
)
- faraday (
~> 0.8
)
-
httpauth (~> 0.1
)
-
jwt (~> 0.1.4
)
- multi_
json (~> 1.0
)
- rack (
~> 1.2
)
+ oauth2 (
1.2.0
)
+ faraday (
>= 0.8, < 0.10
)
+
jwt (~> 1.0
)
+
multi_json (~> 1.3
)
+ multi_
xml (~> 0.5
)
+ rack (
>= 1.2, < 3
)
oj (2.15.0)
oj (2.15.0)
- omniauth (1.
1
.1)
- hashie (
~> 1.2
)
- rack
- omniauth-oauth2 (1.
1.1
)
- oauth2 (~>
0.8
.0)
- omniauth (~> 1.
0
)
-
passenger (4.0.41
)
-
daemon_controller (>= 1.2.
0)
+ omniauth (1.
3
.1)
+ hashie (
>= 1.2, < 4
)
+ rack
(>= 1.0, < 3)
+ omniauth-oauth2 (1.
4.0
)
+ oauth2 (~>
1
.0)
+ omniauth (~> 1.
2
)
+
os (0.9.6
)
+
passenger (5.0.3
0)
rack
rake (>= 0.8.1)
rack
rake (>= 0.8.1)
- pg (0.1
7.1
)
+ pg (0.1
9.0
)
pg_power (1.6.4)
pg
rails (~> 3.1)
polyglot (0.3.5)
pg_power (1.6.4)
pg
rails (~> 3.1)
polyglot (0.3.5)
- power_assert (0.2.6)
- puma (2.8.2)
- rack (>= 1.1, < 2.0)
+ power_assert (0.3.1)
+ puma (2.16.0)
rack (1.4.7)
rack-cache (1.6.1)
rack (>= 0.4)
rack (1.4.7)
rack-cache (1.6.1)
rack (>= 0.4)
@@
-183,22
+193,22
@@
GEM
rake (11.3.0)
rdoc (3.12.2)
json (~> 1.4)
rake (11.3.0)
rdoc (3.12.2)
json (~> 1.4)
- ref (
1.0.5
)
- retriable (
2.1.0
)
- ruby-prof (0.1
5
.2)
- rvm-capistrano (1.5.
1
)
+ ref (
2.0.0
)
+ retriable (
1.4.1
)
+ ruby-prof (0.1
6
.2)
+ rvm-capistrano (1.5.
6
)
capistrano (~> 2.15.4)
safe_yaml (1.0.4)
capistrano (~> 2.15.4)
safe_yaml (1.0.4)
- sass (3.
3.4
)
+ sass (3.
4.22
)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- signet (0.
5.1
)
- addressable (
>= 2.
2.3)
- faraday (
>= 0.9.0.rc5
)
- jwt (
>= 0.
1.5)
- multi_json (
>= 1.0.
0)
+ signet (0.
7.3
)
+ addressable (
~>
2.3)
+ faraday (
~> 0.9
)
+ jwt (
~>
1.5)
+ multi_json (
~> 1.1
0)
simplecov (0.7.1)
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
simplecov (0.7.1)
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
@@
-210,13
+220,14
@@
GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sshkey (1.
6.1
)
- test-unit (3.
1.5
)
+ sshkey (1.
8.0
)
+ test-unit (3.
2.1
)
power_assert
power_assert
- test_after_commit (0.2.3)
+ test_after_commit (1.1.0)
+ activerecord (>= 3.2)
themes_for_rails (0.5.1)
rails (>= 3.0.0)
themes_for_rails (0.5.1)
rails (>= 3.0.0)
- therubyracer (0.12.
1
)
+ therubyracer (0.12.
2
)
libv8 (~> 3.16.14.0)
ref
thor (0.19.1)
libv8 (~> 3.16.14.0)
ref
thor (0.19.1)
@@
-226,11
+237,12
@@
GEM
polyglot (>= 0.3.1)
trollop (2.1.2)
tzinfo (0.3.51)
polyglot (>= 0.3.1)
trollop (2.1.2)
tzinfo (0.3.51)
- uglifier (2.
5.0
)
+ uglifier (2.
7.2
)
execjs (>= 0.3.0)
json (>= 1.8.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
- uuidtools (2.1.5)
- websocket-driver (0.3.2)
+ websocket-driver (0.6.4)
+ websocket-extensions (>= 0.1.0)
+ websocket-extensions (0.1.2)
PLATFORMS
ruby
PLATFORMS
ruby
@@
-239,8
+251,8
@@
DEPENDENCIES
acts_as_api
andand
arvados (>= 0.1.20150615153458)
acts_as_api
andand
arvados (>= 0.1.20150615153458)
- arvados-cli (>= 0.1.201
512071501
26)
- coffee-rails (~> 3.2
.0
)
+ arvados-cli (>= 0.1.201
610171935
26)
+ coffee-rails (~> 3.2)
database_cleaner
factory_girl_rails
faye-websocket
database_cleaner
factory_girl_rails
faye-websocket
@@
-250,17
+262,17
@@
DEPENDENCIES
mocha
multi_json
oj
mocha
multi_json
oj
- omniauth (
= 1.
1.1)
- omniauth-oauth2 (
= 1.
1.1)
+ omniauth (
~>
1.1)
+ omniauth-oauth2 (
~>
1.1)
passenger
pg
pg_power
passenger
pg
pg_power
- puma
- rails (~> 3.2
.0
)
+ puma
(~> 2.0)
+ rails (~> 3.2)
ruby-prof
rvm-capistrano
safe_yaml
ruby-prof
rvm-capistrano
safe_yaml
- sass-rails (
>= 3.2.0
)
+ sass-rails (
~> 3.2
)
simplecov (~> 0.7.1)
simplecov-rcov
sshkey
simplecov (~> 0.7.1)
simplecov-rcov
sshkey
@@
-269,7
+281,7
@@
DEPENDENCIES
themes_for_rails
therubyracer
trollop
themes_for_rails
therubyracer
trollop
- uglifier (
>= 1.0.3
)
+ uglifier (
~> 2.0
)
BUNDLED WITH
BUNDLED WITH
- 1.13.
2
+ 1.13.
6