X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e3a6b8183f0b99b3241f319b7f6223c6c625cfee..ff752b072f44aad142314a57eed79271928d181a:/Gemfile.lock?ds=sidebyside

diff --git a/Gemfile.lock b/Gemfile.lock
index 13a676f59..27b5f5fa7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,180 +2,212 @@ GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
-    actionmailer (3.2.2)
-      actionpack (= 3.2.2)
-      mail (~> 2.4.0)
-    actionpack (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
-      builder (~> 3.0.0)
+    actionmailer (4.0.0)
+      actionpack (= 4.0.0)
+      mail (~> 2.5.3)
+    actionpack (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.1)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.2)
-      activesupport (= 3.2.2)
-      builder (~> 3.0.0)
-    activerecord (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
-    activesupport (3.2.2)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    addressable (2.2.7)
-    arel (3.0.2)
-    builder (3.0.0)
-    cocaine (0.2.1)
-    coffee-rails (3.2.2)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionpack-page_caching (1.0.0)
+      actionpack (>= 4.0.0.beta, < 5.0)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.0)
+    atomic (1.1.14)
+    bigdecimal (1.1.0)
+    builder (3.1.4)
+    climate_control (0.0.3)
+      activesupport (>= 3.0)
+    cocaine (0.5.2)
+      climate_control (>= 0.0.3, < 1.0)
+    coffee-rails (4.0.0)
       coffee-script (>= 2.2.0)
-      railties (~> 3.2.0)
+      railties (>= 4.0.0.beta, < 5.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.2.0)
-    composite_primary_keys (5.0.4)
-      activerecord (~> 3.2.0)
+    coffee-script-source (1.6.3)
+    composite_primary_keys (6.0.0)
+      activerecord (>= 4.0.0)
+    dalli (2.6.4)
     deadlock_retry (1.2.0)
     dynamic_form (1.1.4)
+    ejs (1.1.1)
     erubis (2.7.0)
-    execjs (1.3.0)
-      multi_json (~> 1.0)
-    faraday (0.7.6)
-      addressable (~> 2.2)
-      multipart-post (~> 1.1)
-      rack (~> 1.1)
-    hike (1.2.1)
+    execjs (2.0.2)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
+    hike (1.2.3)
     htmlentities (4.3.1)
-    http_accept_language (1.0.2)
-    httpclient (2.2.4)
-    i18n (0.6.0)
+    http_accept_language (2.0.0)
+    httpauth (0.2.0)
+    httpclient (2.3.4.1)
+    i18n (0.6.5)
     iconv (0.1)
-    journey (1.0.3)
-    jquery-rails (2.0.1)
-      railties (>= 3.2.0, < 5.0)
-      thor (~> 0.14)
-    json (1.6.6)
-    libv8 (3.3.10.4)
-    libxml-ruby (2.3.2)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
+    jquery-rails (3.0.4)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.8.0)
+    jsonify (0.3.1)
+      multi_json (~> 1.0)
+    jsonify-rails (0.3.2)
+      actionpack
+      jsonify (< 0.4.0)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
+    kgio (2.8.1)
+    libxml-ruby (2.7.0)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    memcached (1.4.1)
-    mime-types (1.18)
-    multi_json (1.2.0)
-    multipart-post (1.1.5)
-    nokogiri (1.5.2)
-    oauth (0.4.5)
-    oauth-plugin (0.4.0.rc2)
+    mime-types (1.25)
+    mini_portile (0.5.1)
+    minitest (4.7.5)
+    multi_json (1.8.1)
+    multi_xml (0.5.5)
+    multipart-post (1.2.0)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
+    oauth (0.4.7)
+    oauth-plugin (0.5.1)
       multi_json
       oauth (~> 0.4.4)
-      oauth2
+      oauth2 (>= 0.5.0)
       rack
-    oauth2 (0.5.2)
-      faraday (~> 0.7)
+    oauth2 (0.9.2)
+      faraday (~> 0.8)
+      httpauth (~> 0.2)
+      jwt (~> 0.1.4)
       multi_json (~> 1.0)
-    open_id_authentication (1.1.0)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    open_id_authentication (1.2.0)
       rack-openid (~> 1.3)
-    paperclip (2.7.0)
-      activerecord (>= 2.3.0)
-      activesupport (>= 2.3.2)
-      cocaine (>= 0.0.2)
+    openstreetmap-i18n-js (3.0.0.rc5.2)
+      i18n
+    paperclip (3.5.1)
+      activemodel (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      cocaine (~> 0.5.0)
       mime-types
-    pg (0.13.2)
+    pg (0.17.0)
     polyglot (0.3.3)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
+    psych (2.0.1)
+    r2 (0.2.2)
+    rack (1.5.2)
+    rack-cors (0.2.8)
+      rack
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.2)
-      actionmailer (= 3.2.2)
-      actionpack (= 3.2.2)
-      activerecord (= 3.2.2)
-      activeresource (= 3.2.2)
-      activesupport (= 3.2.2)
-      bundler (~> 1.0)
-      railties (= 3.2.2)
-    rails-i18n (0.6.2)
-      i18n (~> 0.5)
-    railties (3.2.2)
-      actionpack (= 3.2.2)
-      activesupport (= 3.2.2)
-      rack-ssl (~> 1.3.2)
+    rails (4.0.0)
+      actionmailer (= 4.0.0)
+      actionpack (= 4.0.0)
+      activerecord (= 4.0.0)
+      activesupport (= 4.0.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.0)
+      sprockets-rails (~> 2.0.0)
+    rails-i18n (4.0.0)
+      i18n (~> 0.6)
+      rails (~> 4.0.0)
+    railties (4.0.0)
+      actionpack (= 4.0.0)
+      activesupport (= 4.0.0)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    redcarpet (2.1.1)
-    rinku (1.5.1)
-    ruby-openid (2.1.8)
-    sanitize (2.0.3)
-      nokogiri (>= 1.4.4, < 1.6)
-    sass (3.1.15)
-    sass-rails (3.2.5)
-      railties (~> 3.2.0)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.1.0)
+    redcarpet (3.0.0)
+    rinku (1.7.3)
+    ruby-openid (2.3.0)
+    sanitize (2.0.6)
+      nokogiri (>= 1.4.4)
+    sass (3.2.12)
+    sass-rails (4.0.0)
+      railties (>= 4.0.0.beta, < 5.0)
       sass (>= 3.1.10)
-      tilt (~> 1.3)
-    sprockets (2.1.2)
+      sprockets-rails (~> 2.0.0)
+    sprockets (2.10.0)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    therubyracer (0.9.10)
-      libv8 (~> 3.3.10)
-    thor (0.14.6)
-    tilt (1.3.3)
-    timecop (0.3.5)
-    treetop (1.4.10)
+    sprockets-rails (2.0.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    thor (0.18.1)
+    thread_safe (0.1.3)
+      atomic
+    tilt (1.4.1)
+    timecop (0.6.3)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.32)
-    uglifier (1.2.4)
+    tzinfo (0.3.37)
+    uglifier (2.2.1)
       execjs (>= 0.3.0)
-      multi_json (>= 1.0.2)
+      multi_json (~> 1.0, >= 1.0.2)
     validates_email_format_of (1.5.3)
+    vendorer (0.1.14)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
-  coffee-rails (~> 3.2.1)
-  composite_primary_keys (>= 5.0.0)
+  actionpack-page_caching
+  bigdecimal (~> 1.1.0)
+  coffee-rails (~> 4.0.0)
+  composite_primary_keys (>= 6.0.0)
+  dalli
   deadlock_retry (>= 1.2.0)
   dynamic_form
+  ejs
   htmlentities
-  http_accept_language (>= 1.0.2)
+  http_accept_language (~> 2.0.0)
   httpclient
-  iconv
+  iconv (= 0.1)
   jquery-rails
+  json
+  jsonify-rails
+  kgio
   libxml-ruby (>= 2.0.5)
-  memcached (>= 1.4.1)
-  oauth-plugin (>= 0.4.0.pre7)
+  minitest (~> 4.7.0)
+  oauth-plugin (>= 0.5.1)
   open_id_authentication (>= 1.1.0)
-  paperclip (~> 2.0)
+  openstreetmap-i18n-js (>= 3.0.0.rc5.2)
+  paperclip (~> 3.0)
   pg
-  rails (= 3.2.2)
-  rails-i18n (>= 0.6.2)
+  psych
+  r2
+  rack-cors
+  rails (= 4.0.0)
+  rails-i18n (~> 4.0.0)
   redcarpet
   rinku (>= 1.2.2)
+  ruby-openid (>= 2.2.0)
   sanitize
-  sass-rails (~> 3.2.3)
-  therubyracer
+  sass-rails (~> 4.0.0)
   timecop
-  uglifier (>= 1.0.3)
+  uglifier (>= 1.3.0)
   validates_email_format_of (>= 1.5.1)
+  vendorer