projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 4904-arv-web
[arvados.git]
/
services
/
api
/
Gemfile.lock
diff --git
a/services/api/Gemfile.lock
b/services/api/Gemfile.lock
index 69517c1ec61d210722c3fb44111f5dba5ac2aa75..6db1cb443b9793718597cd5fc330e764ea39cfbc 100644
(file)
--- a/
services/api/Gemfile.lock
+++ b/
services/api/Gemfile.lock
@@
-35,18
+35,18
@@
GEM
addressable (2.3.6)
andand (1.3.3)
arel (3.0.3)
addressable (2.3.6)
andand (1.3.3)
arel (3.0.3)
- arvados (0.1.2014
09121520
20)
+ arvados (0.1.2014
11142307
20)
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
50121183928
)
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
.0)
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)
@@
-108,7
+108,7
@@
GEM
json (1.8.1)
jwt (0.1.13)
multi_json (>= 1.5)
json (1.8.1)
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)
addressable (~> 2.3)
libv8 (3.16.14.3)
mail (2.5.4)
@@
-130,7
+130,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.1
)
omniauth (1.1.1)
hashie (~> 1.2)
rack
omniauth (1.1.1)
hashie (~> 1.2)
rack
@@
-174,6
+174,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)
@@
-223,8
+224,8
@@
PLATFORMS
DEPENDENCIES
acts_as_api
andand
DEPENDENCIES
acts_as_api
andand
- arvados (>= 0.1.2014091
2152020
)
- arvados-cli (>= 0.1.201
40912152020
)
+ arvados (>= 0.1.2014091
9104705
)
+ arvados-cli (>= 0.1.201
50121183928
)
coffee-rails (~> 3.2.0)
database_cleaner
factory_girl_rails
coffee-rails (~> 3.2.0)
database_cleaner
factory_girl_rails
@@
-240,6
+241,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)