projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
10008: Move test setup from __init__() to setUp()
[arvados.git]
/
services
/
api
/
Gemfile.lock
diff --git
a/services/api/Gemfile.lock
b/services/api/Gemfile.lock
index 725d40a33db653bc35eef0bd6382893162b99809..6f7875163b63fa6af8462f2999e42bad4902f37d 100644
(file)
--- a/
services/api/Gemfile.lock
+++ b/
services/api/Gemfile.lock
@@
-32,23
+32,23
@@
GEM
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.
3.7
)
+ addressable (2.
4.0
)
andand (1.3.3)
arel (3.0.3)
andand (1.3.3)
arel (3.0.3)
- arvados (0.1.201
5020922375
4)
- activesupport (>= 3
.2.13
)
+ arvados (0.1.201
6042014300
4)
+ activesupport (>= 3
, < 4.2.6
)
andand (~> 1.3, >= 1.3.3)
andand (~> 1.3, >= 1.3.3)
- google-api-client (~> 0.6.3, >= 0.6.3)
+ google-api-client (>= 0.7, < 0.9)
+ i18n (~> 0)
json (~> 1.7, >= 1.7.7)
json (~> 1.7, >= 1.7.7)
- jwt (>= 0.1.5, <
1.0.0
)
- arvados-cli (0.1.201
50205181653
)
+ jwt (>= 0.1.5, <
2
)
+ arvados-cli (0.1.201
61017193526
)
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
.3, >= 0.6.3
)
+ google-api-client (~> 0.6
, >= 0.6.3, < 0.8.9
)
json (~> 1.7, >= 1.7.7)
json (~> 1.7, >= 1.7.7)
- jwt (>= 0.1.5, < 1.0.0)
oj (~> 2.0, >= 2.0.3)
trollop (~> 2.0)
autoparse (0.3.3)
oj (~> 2.0, >= 2.0.3)
trollop (~> 2.0)
autoparse (0.3.3)
@@
-69,7
+69,7
@@
GEM
coffee-script-source
execjs
coffee-script-source (1.7.0)
coffee-script-source
execjs
coffee-script-source (1.7.0)
- curb (0.
8.6
)
+ curb (0.
9.3
)
daemon_controller (1.2.0)
database_cleaner (1.2.0)
erubis (2.7.0)
daemon_controller (1.2.0)
database_cleaner (1.2.0)
erubis (2.7.0)
@@
-81,20
+81,21
@@
GEM
factory_girl_rails (4.4.1)
factory_girl (~> 4.4.0)
railties (>= 3.0.0)
factory_girl_rails (4.4.1)
factory_girl (~> 4.4.0)
railties (>= 3.0.0)
- faraday (0.
8.9
)
- multipart-post (
~> 1.2.0
)
+ faraday (0.
9.2
)
+ multipart-post (
>= 1.2, < 3
)
faye-websocket (0.7.2)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.3.1)
faye-websocket (0.7.2)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.3.1)
- google-api-client (0.
6.4
)
+ google-api-client (0.
7.1
)
addressable (>= 2.3.2)
autoparse (>= 0.3.3)
extlib (>= 0.9.15)
addressable (>= 2.3.2)
autoparse (>= 0.3.3)
extlib (>= 0.9.15)
- faraday (
~> 0.8.4
)
+ faraday (
>= 0.9.0
)
jwt (>= 0.1.5)
launchy (>= 2.1.1)
multi_json (>= 1.0.0)
jwt (>= 0.1.5)
launchy (>= 2.1.1)
multi_json (>= 1.0.0)
- signet (~> 0.4.5)
+ retriable (>= 1.4)
+ signet (>= 0.5.0)
uuidtools (>= 2.1.0)
hashie (1.2.0)
highline (1.6.21)
uuidtools (>= 2.1.0)
hashie (1.2.0)
highline (1.6.21)
@@
-105,18
+106,26
@@
GEM
jquery-rails (3.1.0)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-rails (3.1.0)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
- json (1.8.
2
)
+ json (1.8.
3
)
jwt (0.1.13)
multi_json (>= 1.5)
launchy (2.4.3)
addressable (~> 2.3)
libv8 (3.16.14.3)
jwt (0.1.13)
multi_json (>= 1.5)
launchy (2.4.3)
addressable (~> 2.3)
libv8 (3.16.14.3)
+ lograge (0.3.6)
+ actionpack (>= 3)
+ activesupport (>= 3)
+ railties (>= 3)
+ logstash-event (1.2.02)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
+ metaclass (0.0.4)
mime-types (1.25.1)
mime-types (1.25.1)
- multi_json (1.10.1)
- multipart-post (1.2.0)
+ mocha (1.1.0)
+ metaclass (~> 0.0.1)
+ multi_json (1.12.0)
+ multipart-post (2.0.0)
net-scp (1.2.0)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-scp (1.2.0)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
@@
-130,7
+139,7
@@
GEM
jwt (~> 0.1.4)
multi_json (~> 1.0)
rack (~> 1.2)
jwt (~> 0.1.4)
multi_json (~> 1.0)
rack (~> 1.2)
- oj (2.1
1.4
)
+ oj (2.1
5.0
)
omniauth (1.1.1)
hashie (~> 1.2)
rack
omniauth (1.1.1)
hashie (~> 1.2)
rack
@@
-174,17
+183,19
@@
GEM
rdoc (3.12.2)
json (~> 1.4)
ref (1.0.5)
rdoc (3.12.2)
json (~> 1.4)
ref (1.0.5)
+ retriable (2.1.0)
ruby-prof (0.15.2)
rvm-capistrano (1.5.1)
capistrano (~> 2.15.4)
ruby-prof (0.15.2)
rvm-capistrano (1.5.1)
capistrano (~> 2.15.4)
+ safe_yaml (1.0.4)
sass (3.3.4)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
sass (3.3.4)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- signet (0.
4.5
)
+ signet (0.
5.1
)
addressable (>= 2.2.3)
addressable (>= 2.2.3)
- faraday (
~> 0.8.1
)
+ faraday (
>= 0.9.0.rc5
)
jwt (>= 0.1.5)
multi_json (>= 1.0.0)
simplecov (0.7.1)
jwt (>= 0.1.5)
multi_json (>= 1.0.0)
simplecov (0.7.1)
@@
-210,7
+221,7
@@
GEM
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
- trollop (2.1.
1
)
+ trollop (2.1.
2
)
tzinfo (0.3.39)
uglifier (2.5.0)
execjs (>= 0.3.0)
tzinfo (0.3.39)
uglifier (2.5.0)
execjs (>= 0.3.0)
@@
-224,14
+235,16
@@
PLATFORMS
DEPENDENCIES
acts_as_api
andand
DEPENDENCIES
acts_as_api
andand
- arvados (>= 0.1.20150
209223754
)
- arvados-cli (>= 0.1.201
50128223752
)
+ arvados (>= 0.1.20150
615153458
)
+ arvados-cli (>= 0.1.201
61017193526
)
coffee-rails (~> 3.2.0)
database_cleaner
factory_girl_rails
faye-websocket
coffee-rails (~> 3.2.0)
database_cleaner
factory_girl_rails
faye-websocket
- google-api-client (~> 0.6.3)
jquery-rails
jquery-rails
+ lograge
+ logstash-event
+ mocha
multi_json
oj
omniauth (= 1.1.1)
multi_json
oj
omniauth (= 1.1.1)
@@
-243,6
+256,7
@@
DEPENDENCIES
rails (~> 3.2.0)
ruby-prof
rvm-capistrano
rails (~> 3.2.0)
ruby-prof
rvm-capistrano
+ safe_yaml
sass-rails (>= 3.2.0)
simplecov (~> 0.7.1)
simplecov-rcov
sass-rails (>= 3.2.0)
simplecov (~> 0.7.1)
simplecov-rcov