From 5d2ec456c78b651172879b865a8486198ff2304a Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Sun, 2 Feb 2014 14:32:57 +0100
Subject: [PATCH] Lock paperclip dependency to version 3.5.2

---
 Gemfile                | 2 +-
 spec/dummy_app/Gemfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 45f8471b5b..93a96f8493 100644
--- a/Gemfile
+++ b/Gemfile
@@ -55,7 +55,7 @@ group :test do
   gem 'generator_spec', '>= 0.8'
   gem 'launchy', '>= 2.2'
   gem 'mini_magick', '>= 3.4'
-  gem 'paperclip', '>= 3.4'
+  gem 'paperclip', '3.5.2'
   gem 'poltergeist', github: 'jonleighton/poltergeist'
   gem 'rack-cache', require: 'rack/cache'
   gem 'rspec-rails', '>= 2.14'
diff --git a/spec/dummy_app/Gemfile b/spec/dummy_app/Gemfile
index 419f58b997..6b692cd25d 100644
--- a/spec/dummy_app/Gemfile
+++ b/spec/dummy_app/Gemfile
@@ -42,7 +42,7 @@ gem 'devise', '>= 3.2'
 gem 'dragonfly', '~> 0.9.0'
 gem 'mini_magick', '>= 3.4'
 gem 'mlb', '>= 0.7'
-gem 'paperclip', '>= 3.4'
+gem 'paperclip', '3.5.2'
 gem 'rails_admin', path: '../../'
 
 # Gems used only for assets and not required