X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c53db246f606e0233a524e8f3c6390ea74e96890..87d9ef8ea50e2f6c1df3b3b89e3b393e9bcdab90:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 3bd4682a4..392590cf0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -31,6 +31,8 @@ GEM thread_safe (~> 0.1) tzinfo (~> 1.1) arel (5.0.1.20140414130214) + autoprefixer-rails (2.1.1.20140710) + execjs bigdecimal (1.1.0) builder (3.2.2) capybara (2.4.1) @@ -47,14 +49,14 @@ GEM coffee-rails (4.0.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) - coffee-script (2.2.0) + coffee-script (2.3.0) coffee-script-source execjs - coffee-script-source (1.7.0) + coffee-script-source (1.7.1) colorize (0.7.3) - composite_primary_keys (7.0.3) + composite_primary_keys (7.0.6) activerecord (~> 4.1.4) - crass (0.2.0) + crass (0.2.1) dalli (2.7.2) deadlock_retry (1.2.0) dynamic_form (1.1.4) @@ -66,7 +68,7 @@ GEM htmlentities (4.3.2) http_accept_language (2.0.1) httpclient (2.4.0) - i18n (0.6.9) + i18n (0.6.11) iconv (0.1) jquery-rails (3.1.1) railties (>= 3.0, < 5.0) @@ -91,11 +93,11 @@ GEM treetop (~> 1.4.8) mime-types (1.25.1) mini_portile (0.6.0) - minitest (5.3.5) + minitest (5.4.0) multi_json (1.10.1) multi_xml (0.5.5) multipart-post (2.0.0) - nokogiri (1.6.2.1) + nokogiri (1.6.3.1) mini_portile (= 0.6.0) nokogumbo (1.1.9) nokogiri @@ -105,7 +107,7 @@ GEM oauth (~> 0.4.4) oauth2 (>= 0.5.0) rack - oauth2 (0.9.4) + oauth2 (1.0.0) faraday (>= 0.8, < 0.10) jwt (~> 1.0) multi_json (~> 1.3) @@ -115,7 +117,7 @@ GEM rack-openid (~> 1.3) openstreetmap-i18n-js (3.0.0.rc5.3) i18n - paperclip (4.1.1) + paperclip (4.2.0) activemodel (>= 3.0.0) activesupport (>= 3.0.0) cocaine (~> 0.5.3) @@ -187,12 +189,12 @@ GEM polyglot (>= 0.3.1) tzinfo (1.2.1) thread_safe (~> 0.1) - uglifier (2.5.1) + uglifier (2.5.3) execjs (>= 0.3.0) json (>= 1.8.0) validates_email_format_of (1.5.3) vendorer (0.1.16) - websocket-driver (0.3.3) + websocket-driver (0.3.4) xpath (2.0.0) nokogiri (~> 1.3) @@ -202,6 +204,7 @@ PLATFORMS DEPENDENCIES SystemTimer (>= 1.1.3) actionpack-page_caching + autoprefixer-rails bigdecimal (~> 1.1.0) coffee-rails (~> 4.0.0) composite_primary_keys (~> 7.0.3)