projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
10645: add test for container_request display with input mounts
[arvados.git]
/
services
/
api
/
Gemfile.lock
diff --git
a/services/api/Gemfile.lock
b/services/api/Gemfile.lock
index 3c5a4765fe8683805f7b861fc4a6c0cb9b20cf4f..c59e59d63c5f027de57eda15e36d7a3676a156df 100644
(file)
--- a/
services/api/Gemfile.lock
+++ b/
services/api/Gemfile.lock
@@
-177,9
+177,9
@@
GEM
rack (>= 1.2, < 3)
oj (2.18.5)
oj_mimic_json (1.0.1)
rack (>= 1.2, < 3)
oj (2.18.5)
oj_mimic_json (1.0.1)
- omniauth (1.
6.1
)
- hashie (>=
3.4.6, < 3.6.0
)
- rack (>= 1.
6.2
, < 3)
+ omniauth (1.
4.2
)
+ hashie (>=
1.2, < 4
)
+ rack (>= 1.
0
, < 3)
omniauth-oauth2 (1.4.0)
oauth2 (~> 1.0)
omniauth (~> 1.2)
omniauth-oauth2 (1.4.0)
oauth2 (~> 1.0)
omniauth (~> 1.2)
@@
-215,6
+215,8
@@
GEM
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
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)
railties (4.2.5.2)
actionpack (= 4.2.5.2)
activesupport (= 4.2.5.2)
@@
-295,13
+297,14
@@
DEPENDENCIES
multi_json
oj
oj_mimic_json
multi_json
oj
oj_mimic_json
- omniauth (~> 1.
1
)
+ omniauth (~> 1.
4.0
)
omniauth-oauth2 (~> 1.1)
passenger
pg
protected_attributes
puma (~> 2.0)
rails (~> 4.0)
omniauth-oauth2 (~> 1.1)
passenger
pg
protected_attributes
puma (~> 2.0)
rails (~> 4.0)
+ rails-observers
responders (~> 2.0)
ruby-prof
rvm-capistrano
responders (~> 2.0)
ruby-prof
rvm-capistrano