aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Donnet2012-08-10 09:41:14 +0200
committerLuc Donnet2012-08-10 09:41:14 +0200
commitd3c1d19c2eed0721db35f132e51373483530b7d2 (patch)
tree48341b8d476f715054804737bb73c122ab7c1661
parent4933231bbecc80a515b6285cc58b373c8ca59383 (diff)
downloadchouette-core-d3c1d19c2eed0721db35f132e51373483530b7d2.tar.bz2
Update user interface version
-rw-r--r--Gemfile.lock9
1 files changed, 8 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index f7bad107b..12090529e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -61,7 +61,7 @@ GIT
GIT
remote: git://sim.dryade.priv/user_interface
- revision: 1afb74d751bbe0cef2736e992788aa7d5237f770
+ revision: 2d551a49dc3942851f5f94f8c0f86d2570f80dd2
specs:
user_interface (0.0.1)
rails (> 3.1.0)
@@ -188,6 +188,7 @@ GEM
jruby-rack (1.1.6)
jruby-rack-worker (0.3-java)
jruby-rack (>= 1.0.1)
+ json (1.7.4)
json (1.7.4-java)
json_pure (1.7.3)
launchy (2.1.0)
@@ -196,6 +197,7 @@ GEM
addressable (~> 2.2.6)
ffi (~> 1.0.9)
spoon (~> 0.0.1)
+ libv8 (3.3.10.4)
libwebsocket (0.1.4)
addressable
listen (0.4.7)
@@ -220,6 +222,7 @@ GEM
nokogiri (1.5.5)
nokogiri (1.5.5-java)
orm_adapter (0.4.0)
+ pg (0.11.0)
polyamorous (0.5.0)
activerecord (~> 3.0)
polyglot (0.3.3)
@@ -300,10 +303,13 @@ GEM
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
+ sqlite3 (1.3.6)
squeel (1.0.7)
activerecord (~> 3.0)
activesupport (~> 3.0)
polyamorous (~> 0.5.0)
+ therubyracer (0.10.2)
+ libv8 (~> 3.3.10)
therubyrhino (1.73.4)
thor (0.15.4)
tilt (1.3.3)
@@ -327,6 +333,7 @@ GEM
PLATFORMS
java
+ ruby
DEPENDENCIES
RedCloth