X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ee9ac1930d87466a173fdc992db078cae38d2d44..0d0498d303f36749cd48d8e6eadb1abafe3f828c:/Gemfile.lock?ds=sidebyside

diff --git a/Gemfile.lock b/Gemfile.lock
index b65ba33a6..fda6fccae 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -43,12 +43,12 @@ GEM
     ast (2.1.0)
     astrolabe (1.3.1)
       parser (~> 2.2)
-    autoprefixer-rails (5.2.1.2)
+    autoprefixer-rails (6.0.2)
       execjs
       json
     bigdecimal (1.1.0)
     builder (3.2.2)
-    capybara (2.4.4)
+    capybara (2.5.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -84,8 +84,10 @@ GEM
     dynamic_form (1.1.4)
     erubis (2.7.0)
     execjs (2.6.0)
+    exifr (1.2.3.1)
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
+    fspath (2.1.1)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
     hashie (3.4.2)
@@ -98,7 +100,15 @@ GEM
     i18n (0.7.0)
     i18n-js (3.0.0.rc11)
       i18n (~> 0.6)
-    jquery-rails (4.0.4)
+    image_optim (0.21.0)
+      exifr (~> 1.2, >= 1.2.2)
+      fspath (~> 2.1)
+      image_size (~> 1.3)
+      in_threads (~> 1.3)
+      progress (~> 3.0, >= 3.0.1)
+    image_size (1.4.1)
+    in_threads (1.3.1)
+    jquery-rails (4.0.5)
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -113,8 +123,8 @@ GEM
       actionpack
       jsonify (< 0.4.0)
     jwt (1.5.1)
-    kgio (2.9.3)
-    konacha (3.5.1)
+    kgio (2.10.0)
+    konacha (3.6.0)
       actionpack (>= 3.1, < 5)
       capybara
       colorize
@@ -174,7 +184,7 @@ GEM
       multi_json (~> 1.3)
       omniauth (>= 1.1.1)
       omniauth-oauth2 (>= 1.1.1)
-    paperclip (4.3.0)
+    paperclip (4.3.1)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       cocaine (~> 0.5.5)
@@ -182,13 +192,14 @@ GEM
       mimemagic (= 0.3.0)
     parser (2.2.2.6)
       ast (>= 1.1, < 3.0)
-    pg (0.18.2)
+    pg (0.18.3)
     poltergeist (1.6.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
     powerpack (0.1.1)
+    progress (3.1.0)
     psych (2.0.15)
     r2 (0.2.5)
     rack (1.6.4)
@@ -217,7 +228,7 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
-    rails-i18n (4.0.4)
+    rails-i18n (4.0.5)
       i18n (~> 0.6)
       railties (~> 4.0)
     railties (4.2.4)
@@ -235,7 +246,7 @@ GEM
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
     rinku (1.7.3)
-    rubocop (0.33.0)
+    rubocop (0.34.1)
       astrolabe (~> 1.3)
       parser (>= 2.2.2.5, < 3.0)
       powerpack (~> 0.1)
@@ -247,13 +258,13 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (= 1.4.1)
-    sass (3.4.17)
-    sass-rails (5.0.3)
+    sass (3.4.18)
+    sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
-      tilt (~> 1.1)
+      tilt (>= 1.1, < 3)
     simplecov (0.10.0)
       docile (~> 1.1.0)
       json (~> 1.8)
@@ -265,7 +276,7 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.3.2)
+    sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
@@ -281,7 +292,7 @@ GEM
     tins (1.6.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.7.1)
+    uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     unf (0.1.4)
@@ -315,6 +326,7 @@ DEPENDENCIES
   http_accept_language (~> 2.0.0)
   httpclient
   i18n-js (>= 3.0.0.rc10)
+  image_optim
   jquery-rails
   jshint
   json