aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Florisson2012-09-03 16:18:23 +0200
committerMarc Florisson2012-09-03 16:18:23 +0200
commit6dafb0a0a66ff73d7fde30fb33903e780e2fae1b (patch)
treea0a9b0bfc7706b6c599888aaa6d891066af3f995
parent58438f69e471bcd6c110d6a0dd707f593cfd2162 (diff)
downloadchouette-core-6dafb0a0a66ff73d7fde30fb33903e780e2fae1b.tar.bz2
update user_interface
-rw-r--r--Gemfile.lock10
1 files changed, 8 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 63ab2fda8..64119eba7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -61,7 +61,7 @@ GIT
GIT
remote: git://sim.dryade.priv/user_interface
- revision: 71a7cb5b5db38777d5a251a12d9cd7b6fe3cda95
+ revision: b8fbfaa4b0aa3946223d9f9313af21ab2f10f341
specs:
user_interface (0.0.1)
rails (> 3.1.0)
@@ -70,6 +70,7 @@ GEM
remote: http://rubygems.org/
specs:
GeoRuby (1.3.4)
+ RedCloth (4.2.9)
RedCloth (4.2.9-java)
SyslogLogger (1.4.1)
actionmailer (3.2.6)
@@ -105,6 +106,7 @@ GEM
acts_as_list (0.1.6)
addressable (2.2.8)
arel (3.0.2)
+ bcrypt-ruby (3.0.1)
bcrypt-ruby (3.0.1-java)
bouncy-castle-java (1.5.0146.1)
builder (3.0.0)
@@ -158,6 +160,7 @@ GEM
factory_girl_rails (1.7.0)
factory_girl (~> 2.6.0)
railties (>= 3.0.0)
+ ffi (1.0.11)
ffi (1.0.11-java)
ffi-geos (0.0.6)
ffi (>= 1.0.0)
@@ -177,7 +180,7 @@ GEM
has_scope (0.5.1)
highline (1.6.14)
hike (1.2.1)
- i18n (0.6.0)
+ i18n (0.6.1)
inherited_resources (1.3.1)
has_scope (~> 0.5.0)
responders (~> 0.6)
@@ -194,6 +197,8 @@ GEM
jruby-rack (>= 1.1.1)
json (1.7.5-java)
json_pure (1.7.5)
+ launchy (2.1.0)
+ addressable (~> 2.2.6)
launchy (2.1.0-java)
addressable (~> 2.2.6)
ffi (~> 1.0.9)
@@ -219,6 +224,7 @@ GEM
net-ssh (2.5.2)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
+ nokogiri (1.5.5)
nokogiri (1.5.5-java)
orm_adapter (0.4.0)
polyamorous (0.5.0)