projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '8015-crunch2-mount' closes #8015
[arvados.git]
/
services
/
api
/
Gemfile.lock
diff --git
a/services/api/Gemfile.lock
b/services/api/Gemfile.lock
index 69517c1ec61d210722c3fb44111f5dba5ac2aa75..ac6be5a522303fd7418ba69974165e3b2821e17f 100644
(file)
--- a/
services/api/Gemfile.lock
+++ b/
services/api/Gemfile.lock
@@
-32,21
+32,21
@@
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.
6
)
+ addressable (2.3.
8
)
andand (1.3.3)
arel (3.0.3)
andand (1.3.3)
arel (3.0.3)
- arvados (0.1.201
40912152020
)
+ arvados (0.1.201
50615153458
)
activesupport (>= 3.2.13)
activesupport (>= 3.2.13)
- andand
- google-api-client (~> 0.6.3)
- json (>= 1.7.7)
+ andand
(~> 1.3, >= 1.3.3)
+ google-api-client (~> 0.6.3
, >= 0.6.3
)
+ json (
~> 1.7,
>= 1.7.7)
jwt (>= 0.1.5, < 1.0.0)
jwt (>= 0.1.5, < 1.0.0)
- arvados-cli (0.1.201
40912152020
)
+ arvados-cli (0.1.201
51207150126
)
activesupport (~> 3.2, >= 3.2.13)
andand (~> 1.3, >= 1.3.3)
activesupport (~> 3.2, >= 3.2.13)
andand (~> 1.3, >= 1.3.3)
- arvados (~> 0.1
.0
)
+ arvados (~> 0.1
, >= 0.1.20150128223554
)
curb (~> 0.8)
curb (~> 0.8)
- google-api-client (~> 0.6.3)
+ google-api-client (~> 0.6.3
, >= 0.6.3
)
json (~> 1.7, >= 1.7.7)
jwt (>= 0.1.5, < 1.0.0)
oj (~> 2.0, >= 2.0.3)
json (~> 1.7, >= 1.7.7)
jwt (>= 0.1.5, < 1.0.0)
oj (~> 2.0, >= 2.0.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.8.
8
)
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)
@@
-100,22
+100,25
@@
GEM
highline (1.6.21)
hike (1.2.3)
httpauth (0.2.1)
highline (1.6.21)
hike (1.2.3)
httpauth (0.2.1)
- i18n (0.
6.11
)
+ i18n (0.
7.0
)
journey (1.0.4)
jquery-rails (3.1.0)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
journey (1.0.4)
jquery-rails (3.1.0)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
- json (1.8.
1
)
+ json (1.8.
3
)
jwt (0.1.13)
multi_json (>= 1.5)
jwt (0.1.13)
multi_json (>= 1.5)
- launchy (2.4.
2
)
+ launchy (2.4.
3
)
addressable (~> 2.3)
libv8 (3.16.14.3)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
addressable (~> 2.3)
libv8 (3.16.14.3)
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)
+ mocha (1.1.0)
+ metaclass (~> 0.0.1)
+ multi_json (1.11.1)
multipart-post (1.2.0)
net-scp (1.2.0)
net-ssh (>= 2.6.5)
multipart-post (1.2.0)
net-scp (1.2.0)
net-ssh (>= 2.6.5)
@@
-130,7
+133,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
0.2
)
+ oj (2.1
1.4
)
omniauth (1.1.1)
hashie (~> 1.2)
rack
omniauth (1.1.1)
hashie (~> 1.2)
rack
@@
-174,6
+177,7
@@
GEM
rdoc (3.12.2)
json (~> 1.4)
ref (1.0.5)
rdoc (3.12.2)
json (~> 1.4)
ref (1.0.5)
+ ruby-prof (0.15.2)
rvm-capistrano (1.5.1)
capistrano (~> 2.15.4)
sass (3.3.4)
rvm-capistrano (1.5.1)
capistrano (~> 2.15.4)
sass (3.3.4)
@@
-209,7
+213,7
@@
GEM
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
- trollop (2.
0
)
+ trollop (2.
1.1
)
tzinfo (0.3.39)
uglifier (2.5.0)
execjs (>= 0.3.0)
tzinfo (0.3.39)
uglifier (2.5.0)
execjs (>= 0.3.0)
@@
-223,14
+227,15
@@
PLATFORMS
DEPENDENCIES
acts_as_api
andand
DEPENDENCIES
acts_as_api
andand
- arvados (>= 0.1.201
40912152020
)
- arvados-cli (>= 0.1.201
40912152020
)
+ arvados (>= 0.1.201
50615153458
)
+ arvados-cli (>= 0.1.201
51207150126
)
coffee-rails (~> 3.2.0)
database_cleaner
factory_girl_rails
faye-websocket
google-api-client (~> 0.6.3)
jquery-rails
coffee-rails (~> 3.2.0)
database_cleaner
factory_girl_rails
faye-websocket
google-api-client (~> 0.6.3)
jquery-rails
+ mocha
multi_json
oj
omniauth (= 1.1.1)
multi_json
oj
omniauth (= 1.1.1)
@@
-240,6
+245,7
@@
DEPENDENCIES
pg_power
puma
rails (~> 3.2.0)
pg_power
puma
rails (~> 3.2.0)
+ ruby-prof
rvm-capistrano
sass-rails (>= 3.2.0)
simplecov (~> 0.7.1)
rvm-capistrano
sass-rails (>= 3.2.0)
simplecov (~> 0.7.1)
@@
-250,3
+256,6
@@
DEPENDENCIES
therubyracer
trollop
uglifier (>= 1.0.3)
therubyracer
trollop
uglifier (>= 1.0.3)
+
+BUNDLED WITH
+ 1.10.6