Merge remote-tracking branch 'upstream/pull/3121'

[rails.git] / Vendorfile

diff --git a/Vendorfile b/Vendorfile
index f1188c8bb6c5ed75db6ba0f422e3aca7404a4169..d00557322f5dd3126529c70b010a872910b09f66 100644 (file)
--- a/Vendorfile
+++ b/Vendorfile
@@ -1,6 +1,5 @@
 folder 'vendor/assets' do
   folder 'jquery' do
 folder 'vendor/assets' do
   folder 'jquery' do

-    file 'jquery.cookie.js', 'https://raw.githubusercontent.com/carhartl/jquery-cookie/master/src/jquery.cookie.js'

     file 'jquery.throttle-debounce.js', 'https://raw.githubusercontent.com/cowboy/jquery-throttle-debounce/v1.1/jquery.ba-throttle-debounce.js'
   end
 
     file 'jquery.throttle-debounce.js', 'https://raw.githubusercontent.com/cowboy/jquery-throttle-debounce/v1.1/jquery.ba-throttle-debounce.js'
   end
 


@@ -25,12 +24,6 @@ folder 'vendor/assets' do
     end
   end
 
     end
   end
 

-  folder 'ohauth' do
-    from 'git://github.com/osmlab/ohauth.git' do
-      file 'ohauth.js'
-    end
-  end
-

   folder 'iD' do
     from 'git://github.com/openstreetmap/iD', :branch => 'release' do
       folder 'iD/data', 'dist/data'
   folder 'iD' do
     from 'git://github.com/openstreetmap/iD', :branch => 'release' do
       folder 'iD/data', 'dist/data'