projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '14198-index-accepts-cluster-id' refs #14198
[arvados.git]
/
services
/
api
/
Gemfile.lock
diff --git
a/services/api/Gemfile.lock
b/services/api/Gemfile.lock
index f935f2c0723a64a99bce17cef26679862931672e..e9267dcb3bf84e630ac6b01168e77067793a4ce9 100644
(file)
--- a/
services/api/Gemfile.lock
+++ b/
services/api/Gemfile.lock
@@
-93,10
+93,10
@@
GEM
eventmachine (1.2.6)
execjs (2.7.0)
extlib (0.9.16)
eventmachine (1.2.6)
execjs (2.7.0)
extlib (0.9.16)
- factory_
girl (4.9.0
)
+ factory_
bot (4.11.1
)
activesupport (>= 3.0.0)
activesupport (>= 3.0.0)
- factory_
girl_rails (4.9.0
)
- factory_
girl (~> 4.9.0
)
+ factory_
bot_rails (4.11.1
)
+ factory_
bot (~> 4.11.1
)
railties (>= 3.0.0)
faraday (0.12.2)
multipart-post (>= 1.2, < 3)
railties (>= 3.0.0)
faraday (0.12.2)
multipart-post (>= 1.2, < 3)
@@
-149,7
+149,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.2.
2
)
+ loofah (2.2.
3
)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.0)
@@
-171,7
+171,7
@@
GEM
net-ssh (4.2.0)
net-ssh-gateway (2.0.0)
net-ssh (>= 4.0.0)
net-ssh (4.2.0)
net-ssh-gateway (2.0.0)
net-ssh (>= 4.0.0)
- nokogiri (1.8.
2
)
+ nokogiri (1.8.
5
)
mini_portile2 (~> 2.3.0)
oauth2 (1.4.0)
faraday (>= 0.8, < 0.13)
mini_portile2 (~> 2.3.0)
oauth2 (1.4.0)
faraday (>= 0.8, < 0.13)
@@
-294,7
+294,7
@@
DEPENDENCIES
arvados-cli
coffee-rails (~> 4.0)
database_cleaner
arvados-cli
coffee-rails (~> 4.0)
database_cleaner
- factory_
girl
_rails
+ factory_
bot
_rails
faye-websocket
httpclient
jquery-rails
faye-websocket
httpclient
jquery-rails