projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'origin/master' into origin-2228-check-filter-uuid-columns
[arvados.git]
/
services
/
api
/
Gemfile.lock
diff --git
a/services/api/Gemfile.lock
b/services/api/Gemfile.lock
index c78f3a7befad32cf4b0bedc0b1b89b4752a00fa2..95f37df7d449f48cd6585f19a612b639fba3db49 100644
(file)
--- a/
services/api/Gemfile.lock
+++ b/
services/api/Gemfile.lock
@@
-160,6
+160,7
@@
GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
+ sqlite3 (1.3.8)
test_after_commit (0.2.2)
therubyracer (0.12.0)
libv8 (~> 3.16.14.0)
@@
-195,6
+196,7
@@
DEPENDENCIES
redis
rvm-capistrano
sass-rails (>= 3.2.0)
+ sqlite3
test_after_commit
therubyracer
trollop