projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 6465-optimize-workbench-integration-tests
[arvados.git]
/
apps
/
workbench
/
Gemfile.lock
diff --git
a/apps/workbench/Gemfile.lock
b/apps/workbench/Gemfile.lock
index 19b2857358fe208a52e50dcf50953897856f2da1..9fc75509656a23396bde21b34b9f6dfb395818f5 100644
(file)
--- a/
apps/workbench/Gemfile.lock
+++ b/
apps/workbench/Gemfile.lock
@@
-30,6
+30,8
@@
GEM
activemodel (= 4.1.9)
activesupport (= 4.1.9)
arel (~> 5.0.0)
activemodel (= 4.1.9)
activesupport (= 4.1.9)
arel (~> 5.0.0)
+ activerecord-nulldb-adapter (0.3.1)
+ activerecord (>= 2.0.0)
activesupport (4.1.9)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
activesupport (4.1.9)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
@@
-40,7
+42,7
@@
GEM
andand (1.3.3)
angularjs-rails (1.3.8)
arel (5.0.1.20140414130214)
andand (1.3.3)
angularjs-rails (1.3.8)
arel (5.0.1.20140414130214)
- arvados (0.1.20150
313191637
)
+ arvados (0.1.20150
511150219
)
activesupport (>= 3.2.13)
andand (~> 1.3, >= 1.3.3)
google-api-client (~> 0.6.3, >= 0.6.3)
activesupport (>= 3.2.13)
andand (~> 1.3, >= 1.3.3)
google-api-client (~> 0.6.3, >= 0.6.3)
@@
-229,7
+231,6
@@
GEM
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
- sqlite3 (1.3.10)
sshkey (1.6.1)
therubyracer (0.12.1)
libv8 (~> 3.16.14.0)
sshkey (1.6.1)
therubyracer (0.12.1)
libv8 (~> 3.16.14.0)
@@
-256,9
+257,10
@@
PLATFORMS
DEPENDENCIES
RedCloth
DEPENDENCIES
RedCloth
+ activerecord-nulldb-adapter
andand
angularjs-rails
andand
angularjs-rails
- arvados (>= 0.1.20150
313191637
)
+ arvados (>= 0.1.20150
511150219
)
bootstrap-sass (~> 3.1.0)
bootstrap-tab-history-rails
bootstrap-x-editable-rails
bootstrap-sass (~> 3.1.0)
bootstrap-tab-history-rails
bootstrap-x-editable-rails
@@
-292,7
+294,6
@@
DEPENDENCIES
selenium-webdriver
simplecov (~> 0.7)
simplecov-rcov
selenium-webdriver
simplecov (~> 0.7)
simplecov-rcov
- sqlite3
sshkey
themes_for_rails!
therubyracer
sshkey
themes_for_rails!
therubyracer