From 1909c50647094fa63eccf63f57cbcc9ef58746ca Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Mon, 13 Oct 2014 15:08:15 +0200 Subject: [PATCH] bundle update --- Gemfile.lock | 149 +++++++++++++++++++++++++-------------------------- 1 file changed, 74 insertions(+), 75 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 45d47aee..72b86129 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,15 +1,15 @@ GIT remote: git://github.com/livingsocial/rake-pipeline.git - revision: 65b1e744defa208e313703d89f3453447cc103b2 + revision: a75d96fbadcc659a35a0ae59212e0bc60b58cc54 specs: rake-pipeline (0.8.0) json - rake (~> 10.0.0) + rake (~> 10.1.0) thor GIT remote: git://github.com/wycats/rake-pipeline-web-filters.git - revision: fd8d838491bd6b8de0bab72d90115b9a4f2da8a1 + revision: 7bd283aac83d7c46a8908f089033a6087d7cd68f specs: rake-pipeline-web-filters (0.6.0) rack @@ -18,103 +18,104 @@ GIT GEM remote: http://rubygems.org/ specs: - POpen4 (0.1.4) - Platform (>= 0.4.0) - open4 - Platform (0.4.0) - backports (3.0.3) - celluloid (0.15.2) - timers (~> 1.1.0) - chunky_png (1.2.7) - coderay (1.0.9) - coffee-script (2.2.0) + backports (3.6.3) + celluloid (0.16.0) + timers (~> 4.0.0) + chunky_png (1.3.1) + coderay (1.1.0) + coffee-script (2.3.0) coffee-script-source execjs - coffee-script-source (1.5.0) - compass (0.12.2) + coffee-script-source (1.8.0) + compass (1.0.1) chunky_png (~> 1.2) - fssm (>= 0.2.7) - sass (~> 3.1) - diff-lcs (1.2.1) - eventmachine (1.0.0) - execjs (1.4.0) + compass-core (~> 1.0.1) + compass-import-once (~> 1.0.5) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) + sass (>= 3.3.13, < 3.5) + compass-core (1.0.1) multi_json (~> 1.0) - ffi (1.9.3) - foreman (0.61.0) - thor (>= 0.13.6) - fssm (0.2.10) - guard (1.6.2) - listen (>= 0.6.0) - lumberjack (>= 1.0.2) - pry (>= 0.9.10) - terminal-table (>= 1.4.3) - thor (>= 0.14.6) - handlebars (0.4.0) - commonjs (~> 0.2.3) - therubyracer (~> 0.11.1) + sass (>= 3.3.0, < 3.5) + compass-import-once (1.0.5) + sass (>= 3.2, < 3.5) + diff-lcs (1.2.5) + dotenv (0.11.1) + dotenv-deployment (~> 0.0.2) + dotenv-deployment (0.0.2) + execjs (2.2.1) + ffi (1.9.6) + foreman (0.75.0) + dotenv (~> 0.11.1) + thor (~> 0.19.1) + formatador (0.2.5) + guard (2.6.1) + formatador (>= 0.2.4) + listen (~> 2.7) + lumberjack (~> 1.0) + pry (>= 0.9.12) + thor (>= 0.18.1) hashr (0.0.22) - i18n (0.6.3) - json (1.7.7) - libv8 (3.16.14.3) - listen (2.7.9) + hitimes (1.2.2) + json (1.8.1) + libv8 (3.16.14.7) + listen (2.7.11) celluloid (>= 0.15.2) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - lumberjack (1.0.2) - method_source (0.8.1) - multi_json (1.6.1) - open4 (1.3.0) - pry (0.9.12) - coderay (~> 1.0.5) - method_source (~> 0.8) + lumberjack (1.0.9) + method_source (0.8.2) + multi_json (1.10.1) + pry (0.10.1) + coderay (~> 1.1.0) + method_source (~> 0.8.1) slop (~> 3.4) - puma (2.6.0) + puma (2.9.1) rack (>= 1.1, < 2.0) rack (1.5.2) rack-mobile-detect (0.4.0) rack - rack-protection (1.3.2) + rack-protection (1.5.3) rack - rack-ssl (1.3.3) + rack-ssl (1.4.1) rack rack-test (0.6.2) rack (>= 1.0) - rake (10.0.3) - rb-fsevent (0.9.3) + rake (10.1.1) + rb-fsevent (0.9.4) rb-inotify (0.9.5) ffi (>= 0.5.0) rerun (0.10.0) listen (~> 2.7, >= 2.7.3) - rspec (2.13.0) - rspec-core (~> 2.13.0) - rspec-expectations (~> 2.13.0) - rspec-mocks (~> 2.13.0) - rspec-core (2.13.0) - rspec-expectations (2.13.0) + rspec (2.99.0) + rspec-core (~> 2.99.0) + rspec-expectations (~> 2.99.0) + rspec-mocks (~> 2.99.0) + rspec-core (2.99.2) + rspec-expectations (2.99.2) diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.13.0) - sass (3.2.6) - sinatra (1.3.5) + rspec-mocks (2.99.2) + sass (3.4.5) + sinatra (1.4.5) rack (~> 1.4) - rack-protection (~> 1.3) - tilt (~> 1.3, >= 1.3.3) - sinatra-contrib (1.3.2) + rack-protection (~> 1.4) + tilt (~> 1.3, >= 1.3.4) + sinatra-contrib (1.4.2) backports (>= 2.0) - eventmachine + multi_json rack-protection rack-test - sinatra (~> 1.3.0) + sinatra (~> 1.4.0) tilt (~> 1.3) - slop (3.4.3) - terminal-table (1.4.5) - thor (0.17.0) - tilt (1.3.3) - timers (1.1.0) - uglifier (1.3.0) + slop (3.6.0) + thor (0.19.1) + tilt (1.4.1) + timers (4.0.1) + hitimes + uglifier (2.5.3) execjs (>= 0.3.0) - multi_json (~> 1.0, >= 1.0.2) - yui-compressor (0.9.6) - POpen4 (>= 0.1.4) + json (>= 1.8.0) + yui-compressor (0.12.0) PLATFORMS ruby @@ -124,10 +125,8 @@ DEPENDENCIES compass foreman guard - handlebars hashr - localeapp - localeapp-handlebars_i18n + libv8 (~> 3.16.0) puma rack-mobile-detect rack-protection (~> 1.3)