diff options
| author | Michel Etienne | 2012-06-27 23:07:40 +0200 |
|---|---|---|
| committer | Michel Etienne | 2012-06-27 23:07:40 +0200 |
| commit | 56de2324949f9035ccb30f0ddbf86a2b6b3aebc3 (patch) | |
| tree | 26f456bd95108d4eb56ab42b8f76b3191c87ae3a /Gemfile.lock | |
| parent | c62096215aa1b98f79e81ea8a1271814d14d6ca0 (diff) | |
| parent | e23bf6c2789b174d7ce847270f45d15b8633000c (diff) | |
| download | chouette-core-56de2324949f9035ccb30f0ddbf86a2b6b3aebc3.tar.bz2 | |
Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index ea51bb146..97f1ed577 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://chouette.dryade.priv/ninoxe - revision: d9c03d4ae42f1bc229949504f0002954b3f6caee + revision: f9c6b5bde626d60b5a902ecc73e0469832864d52 specs: ninoxe (0.0.8) GeoRuby @@ -69,7 +69,7 @@ GIT GIT remote: git://sim.dryade.priv/user_interface - revision: c75665070cace889923bea6a0fb1f7ff724d1368 + revision: 5302812852d2bd28ae29e49bc0d64a3bfb61fbc9 specs: user_interface (0.0.1) rails (~> 3.1.0) @@ -169,8 +169,8 @@ GEM ffi (1.0.11-java) ffi-geos (0.0.4) ffi (~> 1.0.0) - formtastic (2.0.2) - rails (~> 3.0) + formtastic (2.2.1) + actionpack (>= 3.0) geokit (1.6.5) multi_json georuby (1.9.7) @@ -217,7 +217,9 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) map_layers (0.0.5) - mime-types (1.18) + mime-types (1.19) + modernizr (2.5.3) + sprockets (~> 2.0) multi_json (1.3.6) net-scp (1.0.4) net-ssh (>= 1.99.1) @@ -368,7 +370,7 @@ DEPENDENCIES devise factory_girl_rails (= 1.7) ffi-proj4! - formtastic (= 2.0.2) + formtastic georuby-ext! guard guard-rspec @@ -379,6 +381,7 @@ DEPENDENCIES json launchy map_layers (~> 0.0.4) + modernizr ninoxe! pg (~> 0.11.0) rails (= 3.1.3) |