projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
enable auto job links
[arvados.git]
/
Gemfile.lock
diff --git
a/Gemfile.lock
b/Gemfile.lock
index e8f6fb5fa41d057ce7c7ca85e8172d485c4ca8bc..0df71894137f3e24ad6ba02820f1440ac827f341 100644
(file)
--- a/
Gemfile.lock
+++ b/
Gemfile.lock
@@
-73,6
+73,7
@@
GEM
net-ssh (2.6.3)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
net-ssh (2.6.3)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
+ oj (1.2.1)
passenger (3.0.19)
daemon_controller (>= 1.0.0)
fastthread (>= 1.0.1)
passenger (3.0.19)
daemon_controller (>= 1.0.0)
fastthread (>= 1.0.1)
@@
-139,6
+140,8
@@
DEPENDENCIES
anjlab-bootstrap-rails (>= 2.2)
coffee-rails (~> 3.2.1)
jquery-rails
anjlab-bootstrap-rails (>= 2.2)
coffee-rails (~> 3.2.1)
jquery-rails
+ multi_json
+ oj
passenger
pg
rails (= 3.2.11)
passenger
pg
rails (= 3.2.11)