projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch '13933-dispatch-batch-size'
[arvados.git]
/
apps
/
workbench
/
Gemfile.lock
diff --git
a/apps/workbench/Gemfile.lock
b/apps/workbench/Gemfile.lock
index 9c4cd678b0cf9aa38a110a32e1223586dceb0afb..06460ad06c1487d1d0c2e08978f36c644de95624 100644
(file)
--- a/
apps/workbench/Gemfile.lock
+++ b/
apps/workbench/Gemfile.lock
@@
-186,7
+186,7
@@
GEM
mini_portile2 (~> 2.3.0)
npm-rails (0.2.1)
rails (>= 3.2)
- oj (3.
5.0
)
+ oj (3.
6.4
)
os (0.9.6)
passenger (5.2.1)
rack
@@
-358,4
+358,4
@@
DEPENDENCIES
wiselinks
BUNDLED WITH
- 1.16.
1
+ 1.16.
2