From beda9b2a1a04c8fbf373b8df33b2f73460bcae9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Wed, 10 Jul 2013 15:02:31 +0200
Subject: [PATCH] bump carrierwave
---
Gemfile | 2 +-
Gemfile.lock | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Gemfile b/Gemfile
index 1f1c66d18f..8638be2b95 100644
--- a/Gemfile
+++ b/Gemfile
@@ -41,7 +41,7 @@ gem 'foreigner', '1.4.1'
# File uploading
-gem 'carrierwave', '0.8.0'
+gem 'carrierwave', '0.9.0'
gem 'fog', '1.12.1'
gem 'mini_magick', '3.6.0'
gem 'remotipart', '1.0.5'
diff --git a/Gemfile.lock b/Gemfile.lock
index 83884035d6..727f68c10c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -51,9 +51,10 @@ GEM
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
- carrierwave (0.8.0)
+ carrierwave (0.9.0)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
+ json (>= 1.7)
celluloid (0.13.0)
timers (>= 1.0.0)
childprocess (0.3.9)
@@ -419,7 +420,7 @@ DEPENDENCIES
asset_sync (= 0.5.4)
bootstrap-sass (= 2.2.2.0)
capybara (= 2.1.0)
- carrierwave (= 0.8.0)
+ carrierwave (= 0.9.0)
client_side_validations (= 3.2.5)
compass-rails (= 1.0.3)
configurate (= 0.0.8)
@@ -482,7 +483,7 @@ DEPENDENCIES
slim (= 1.3.9)
spork (= 1.0.0rc3)
timecop (= 0.6.1)
- twitter (= 4.7.0)
+ twitter (= 3.7.0)
typhoeus (= 0.6.3)
uglifier (= 2.1.1)
unicorn (= 4.6.3)
--
GitLab