Include selected layer in short links

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 676595a47463830f8b37f1c228e09675cbaf7846..2d3111b46ce2c37f915962e50f0354d464e4eb67 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,7 +28,7 @@ GEM
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    arel (4.0.1)
+    arel (4.0.2)
     atomic (1.1.14)
     bigdecimal (1.1.0)
     builder (3.1.4)
@@ -42,7 +42,7 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.3)
+    coffee-script-source (1.7.0)
     composite_primary_keys (6.0.1)
       activerecord (>= 4.0.0)
     dalli (2.7.0)
@@ -54,11 +54,11 @@ GEM
       multipart-post (>= 1.2, < 3)
     hike (1.2.3)
     htmlentities (4.3.1)
-    http_accept_language (2.0.0)
+    http_accept_language (2.0.1)
     httpclient (2.3.4.1)
     i18n (0.6.9)
     iconv (0.1)
-    jquery-rails (3.0.4)
+    jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
@@ -67,9 +67,9 @@ GEM
     jsonify-rails (0.3.2)
       actionpack
       jsonify (< 0.4.0)
-    jwt (0.1.10)
+    jwt (0.1.11)
       multi_json (>= 1.5)
-    kgio (2.8.1)
+    kgio (2.9.1)
     libxml-ruby (2.7.0)
     mail (2.5.4)
       mime-types (~> 1.16)
@@ -98,18 +98,18 @@ GEM
       rack-openid (~> 1.3)
     openstreetmap-i18n-js (3.0.0.rc5.3)
       i18n
-    paperclip (3.5.2)
+    paperclip (4.1.0)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
       mime-types
     pg (0.17.1)
     polyglot (0.3.3)
-    psych (2.0.2)
+    psych (2.0.4)
     r2 (0.2.2)
     rack (1.5.2)
     rack-cors (0.2.9)
-    rack-openid (1.4.1)
+    rack-openid (1.4.2)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
     rack-test (0.6.2)
@@ -133,10 +133,10 @@ GEM
     rake (10.1.1)
     redcarpet (3.0.0)
     rinku (1.7.3)
-    ruby-openid (2.3.0)
+    ruby-openid (2.5.0)
     sanitize (2.1.0)
       nokogiri (>= 1.4.4)
-    sass (3.2.13)
+    sass (3.2.14)
     sass-rails (4.0.1)
       railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
@@ -191,7 +191,7 @@ DEPENDENCIES
   oauth-plugin (>= 0.5.1)
   open_id_authentication (>= 1.1.0)
   openstreetmap-i18n-js (>= 3.0.0.rc5.3)
-  paperclip (~> 3.0)
+  paperclip (~> 4.0)
   pg
   psych
   r2