Merge branch 'master' into notes
[rails.git] / Vendorfile
index 000a05ff7601b725b8dc118dc0f638b17717da71..d11ca37fcbf631f9f8271a98c6ec9bf9abeb0aae 100644 (file)
@@ -1,23 +1,27 @@
 folder 'vendor/assets' do
   folder 'leaflet' do
-    from 'https://github.com/jfirebaugh/Leaflet.git', :branch => 'osm' do
-      file 'leaflet.css',    'dist/leaflet.css'
+    from 'git://github.com/Leaflet/Leaflet.git', :tag => 'v0.5' do
+      file 'leaflet.css', 'dist/leaflet.css'
       file 'leaflet.ie.css', 'dist/leaflet.ie.css'
-      file 'leaflet.js',     'dist/leaflet-src.js'
+      file 'leaflet.js', 'dist/leaflet-src.js'
       folder 'images', 'dist/images'
     end
 
-    from 'https://github.com/jfirebaugh/leaflet-locationfilter.git', :branch => 'osm' do
+    from 'git://github.com/kajic/leaflet-locationfilter.git' do
       file 'leaflet.locationfilter.css', 'src/locationfilter.css'
-      file 'leaflet.locationfilter.js',  'src/locationfilter.js'
+      file 'leaflet.locationfilter.js', 'src/locationfilter.js'
       folder 'img', 'src/img'
     end
 
-    file 'leaflet.pan.js',  'https://raw.github.com/kartena/Leaflet.Pancontrol/master/src/L.Control.Pan.js'
-    file 'leaflet.zoom.js', 'https://raw.github.com/kartena/Leaflet.zoomslider/master/src/L.Control.Zoomslider.js'
-    # CSS and sprite image are our own
+    from 'git://github.com/kartena/Leaflet.Pancontrol.git' do
+      file 'leaflet.pan.js', 'src/L.Control.Pan.js'
+    end
+
+    from 'git://github.com/kartena/Leaflet.zoomslider.git' do
+      file 'leaflet.zoom.js', 'src/L.Control.Zoomslider.js'
+    end
 
-    from 'https://github.com/jfirebaugh/leaflet-osm.git' do
+    from 'git://github.com/jfirebaugh/leaflet-osm.git' do
       file 'leaflet.osm.js', 'leaflet-osm.js'
     end
   end