projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 9767-workflows-in-chooser
[arvados.git]
/
apps
/
workbench
/
Gemfile.lock
diff --git
a/apps/workbench/Gemfile.lock
b/apps/workbench/Gemfile.lock
index fdcd375ed2081b0d1a770900c3d0dde5ccae67d2..03bbbce0614eb37411ac993ea1d8af0d2f3bbdeb 100644
(file)
--- a/
apps/workbench/Gemfile.lock
+++ b/
apps/workbench/Gemfile.lock
@@
-142,6
+142,11
@@
GEM
logging (2.1.0)
little-plugger (~> 1.1)
multi_json (~> 1.10)
logging (2.1.0)
little-plugger (~> 1.1)
multi_json (~> 1.10)
+ lograge (0.3.6)
+ actionpack (>= 3)
+ activesupport (>= 3)
+ railties (>= 3)
+ logstash-event (1.2.02)
mail (2.6.3)
mime-types (>= 1.16, < 3)
memoist (0.14.0)
mail (2.6.3)
mime-types (>= 1.16, < 3)
memoist (0.14.0)
@@
-218,7
+223,7
@@
GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (~> 1.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (~> 1.1)
- selenium-webdriver (2.
48
.1)
+ selenium-webdriver (2.
53
.1)
childprocess (~> 0.5)
multi_json (~> 1.0)
rubyzip (~> 1.0)
childprocess (~> 0.5)
multi_json (~> 1.0)
rubyzip (~> 1.0)
@@
-284,6
+289,8
@@
DEPENDENCIES
jquery-rails
less
less-rails
jquery-rails
less
less-rails
+ lograge
+ logstash-event
minitest (>= 5.0.0)
mocha
morrisjs-rails
minitest (>= 5.0.0)
mocha
morrisjs-rails