projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2257-inequality-conditions' into 2290-user-activity
[arvados.git]
/
apps
/
workbench
/
Gemfile.lock
diff --git
a/apps/workbench/Gemfile.lock
b/apps/workbench/Gemfile.lock
index 7f4dc8e289150c38165528556f504eb6372dfe4f..c7ffeb00574af4be2d89aa22589e555bd02e75ff 100644
(file)
--- a/
apps/workbench/Gemfile.lock
+++ b/
apps/workbench/Gemfile.lock
@@
-51,6
+51,7
@@
GEM
coffee-script-source (1.6.3)
commonjs (0.2.7)
daemon_controller (1.1.7)
coffee-script-source (1.6.3)
commonjs (0.2.7)
daemon_controller (1.1.7)
+ deep_merge (1.0.1)
erubis (2.7.0)
execjs (2.0.2)
highline (1.6.20)
erubis (2.7.0)
execjs (2.0.2)
highline (1.6.20)
@@
-153,6
+154,7
@@
DEPENDENCIES
bootstrap-sass (~> 3.1.0)
bootstrap-x-editable-rails
coffee-rails (~> 3.2.0)
bootstrap-sass (~> 3.1.0)
bootstrap-x-editable-rails
coffee-rails (~> 3.2.0)
+ deep_merge
httpclient
jquery-rails
less
httpclient
jquery-rails
less