Use uniform abbreviations for CC licenses

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index aeaa596e1aac37cd4d592d7bc97ece73a017f2c9..51936b05ff4ab61e364becbdac1fe519717aeeb0 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -55,7 +55,7 @@ GEM
       multipart-post (~> 1.2.0)
     hike (1.2.3)
     htmlentities (4.3.1)
       multipart-post (~> 1.2.0)
     hike (1.2.3)
     htmlentities (4.3.1)

-    http_accept_language (1.0.2)
+    http_accept_language (2.0.0)

     httpauth (0.2.0)
     httpclient (2.3.4.1)
     i18n (0.6.5)
     httpauth (0.2.0)
     httpclient (2.3.4.1)
     i18n (0.6.5)


@@ -85,6 +85,11 @@ GEM
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
     oauth (0.4.7)
     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 (>= 0.5.0)
+      rack

     oauth2 (0.9.2)
       faraday (~> 0.8)
       httpauth (~> 0.2)
     oauth2 (0.9.2)
       faraday (~> 0.8)
       httpauth (~> 0.2)


@@ -96,15 +101,10 @@ GEM
       rack-openid (~> 1.3)
     openstreetmap-i18n-js (3.0.0.rc5.2)
       i18n
       rack-openid (~> 1.3)
     openstreetmap-i18n-js (3.0.0.rc5.2)
       i18n

-    openstreetmap-oauth-plugin (0.4.1.2)
-      multi_json
-      oauth (~> 0.4.4)
-      oauth2 (>= 0.5.0)
-      rack
-    paperclip (2.8.0)
-      activerecord (>= 2.3.0)
-      activesupport (>= 2.3.2)
-      cocaine (>= 0.0.2)
+    paperclip (3.5.1)
+      activemodel (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      cocaine (~> 0.5.0)

       mime-types
     pg (0.17.0)
     polyglot (0.3.3)
       mime-types
     pg (0.17.0)
     polyglot (0.3.3)


@@ -182,7 +182,7 @@ DEPENDENCIES
   dynamic_form
   ejs
   htmlentities
   dynamic_form
   ejs
   htmlentities

-  http_accept_language (~> 1.0.2)
+  http_accept_language (~> 2.0.0)

   httpclient
   iconv (= 0.1)
   jquery-rails
   httpclient
   iconv (= 0.1)
   jquery-rails


@@ -191,10 +191,10 @@ DEPENDENCIES
   kgio
   libxml-ruby (>= 2.0.5)
   minitest (~> 4.7.0)
   kgio
   libxml-ruby (>= 2.0.5)
   minitest (~> 4.7.0)

+  oauth-plugin (>= 0.5.1)

   open_id_authentication (>= 1.1.0)
   openstreetmap-i18n-js (>= 3.0.0.rc5.2)
   open_id_authentication (>= 1.1.0)
   openstreetmap-i18n-js (>= 3.0.0.rc5.2)

-  openstreetmap-oauth-plugin (>= 0.4.1.1)
-  paperclip (~> 2.0)
+  paperclip (~> 3.0)

   pg
   psych
   r2
   pg
   psych
   r2