projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '19972-go-client-retry'
[arvados.git]
/
services
/
api
/
Gemfile.lock
diff --git
a/services/api/Gemfile.lock
b/services/api/Gemfile.lock
index 6bc53be4f886286103023537dd3b335fae8f34b1..031bd9267e8a39764f745064e420804a0e8688c7 100644
(file)
--- a/
services/api/Gemfile.lock
+++ b/
services/api/Gemfile.lock
@@
-123,7
+123,7
@@
GEM
railties (>= 4)
request_store (~> 1.0)
logstash-event (1.2.02)
railties (>= 4)
request_store (~> 1.0)
logstash-event (1.2.02)
- loofah (2.1
8.0
)
+ loofah (2.1
9.1
)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
@@
-140,19
+140,19
@@
GEM
multi_json (1.15.0)
multipart-post (2.1.1)
nio4r (2.5.8)
multi_json (1.15.0)
multipart-post (2.1.1)
nio4r (2.5.8)
- nokogiri (1.13.
7
)
+ nokogiri (1.13.
10
)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
oj (3.9.2)
optimist (3.0.0)
os (1.1.1)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
oj (3.9.2)
optimist (3.0.0)
os (1.1.1)
- passenger (6.0.
2
)
+ passenger (6.0.
15
)
rack
rake (>= 0.8.1)
pg (1.1.4)
power_assert (1.1.4)
public_suffix (4.0.6)
rack
rake (>= 0.8.1)
pg (1.1.4)
power_assert (1.1.4)
public_suffix (4.0.6)
- racc (1.6.
0
)
+ racc (1.6.
1
)
rack (2.2.4)
rack-test (2.0.2)
rack (>= 1.3)
rack (2.2.4)
rack-test (2.0.2)
rack (>= 1.3)
@@
-176,8
+176,8
@@
GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
- rails-html-sanitizer (1.4.
3
)
- loofah (~> 2.
3
)
+ rails-html-sanitizer (1.4.
4
)
+ loofah (~> 2.
19, >= 2.19.1
)
rails-observers (0.1.5)
activemodel (>= 4.0)
rails-perftest (0.0.7)
rails-observers (0.1.5)
activemodel (>= 4.0)
rails-perftest (0.0.7)