projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 8099-babysit-all-srun
[arvados.git]
/
apps
/
workbench
/
Gemfile.lock
diff --git
a/apps/workbench/Gemfile.lock
b/apps/workbench/Gemfile.lock
index 8b2118ce087d220c32edf4acd35e7a934404a946..b4e2400beda11a9186dd5f4c04468638f237a517 100644
(file)
--- a/
apps/workbench/Gemfile.lock
+++ b/
apps/workbench/Gemfile.lock
@@
-68,7
+68,7
@@
GEM
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
- capybara (2.
4.4
)
+ capybara (2.
5.0
)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
@@
-132,7
+132,7
@@
GEM
mail (2.6.3)
mime-types (>= 1.16, < 3)
metaclass (0.0.4)
mail (2.6.3)
mime-types (>= 1.16, < 3)
metaclass (0.0.4)
- mime-types (2.
6.1
)
+ mime-types (2.
99
)
mini_portile (0.6.2)
minitest (5.7.0)
mocha (1.1.0)
mini_portile (0.6.2)
minitest (5.7.0)
mocha (1.1.0)
@@
-148,7
+148,7
@@
GEM
net-ssh (2.9.2)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
net-ssh (2.9.2)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
- nokogiri (1.6.
5
)
+ nokogiri (1.6.
6.4
)
mini_portile (~> 0.6.0)
oj (2.11.2)
passenger (4.0.57)
mini_portile (~> 0.6.0)
oj (2.11.2)
passenger (4.0.57)
@@
-294,6
+294,3
@@
DEPENDENCIES
therubyracer
uglifier (>= 1.0.3)
wiselinks
therubyracer
uglifier (>= 1.0.3)
wiselinks
-
-BUNDLED WITH
- 1.10.6