aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock15
1 files changed, 7 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 509902435..c78dd01d7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,11 @@
GIT
remote: git://chouette.dryade.priv/ninoxe
- revision: f6eceeafbdf02f5898256c467e86c60a045737ba
+ revision: 3cdd4be0710cd295c62c3c8050c849cce355682d
specs:
ninoxe (0.0.8)
GeoRuby
activerecord (>= 3.1.3)
- acts_as_list (= 0.1.6)
+ acts_as_list (>= 0.1.6)
composite_primary_keys (>= 4.1.2)
geokit
rails (>= 3.1.3)
@@ -142,8 +142,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.3.3)
- composite_primary_keys (5.0.8)
- activerecord (~> 3.2.0)
+ composite_primary_keys (5.0.10)
delayed_job (3.0.3)
activesupport (~> 3.0)
delayed_job_active_record (0.3.2)
@@ -225,7 +224,7 @@ GEM
map_layers (0.0.5)
mime-types (1.19)
modernizr-rails (2.0.6)
- multi_json (1.3.6)
+ multi_json (1.3.7)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
@@ -266,7 +265,7 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (0.9.2.2)
+ rake (0.9.5)
ransack (0.7.0)
actionpack (~> 3.0)
activerecord (~> 3.0)
@@ -333,10 +332,10 @@ GEM
therubyrhino_jar (1.7.4)
thor (0.16.0)
tilt (1.3.3)
- treetop (1.4.11)
+ treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.33)
+ tzinfo (0.3.35)
uglifier (1.2.7)
execjs (>= 0.3.0)
multi_json (~> 1.3)