From 90b3fdda8e6c875da0752bcd697cdbd739a02baf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Fri, 15 Feb 2013 16:26:59 +0100
Subject: [PATCH] bump activerecord-import
---
Gemfile | 2 +-
Gemfile.lock | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Gemfile b/Gemfile
index 429f019d1e..3966d9347d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -51,7 +51,7 @@ end
# database
-gem "activerecord-import", "0.2.11"
+gem "activerecord-import", "0.3.1"
gem 'foreigner', '1.3.0'
gem 'mysql2', '0.3.11' if ENV['DB'].nil? || ENV['DB'] == 'all' || ENV['DB'] == 'mysql'
gem 'pg', '0.14.1' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres'
diff --git a/Gemfile.lock b/Gemfile.lock
index c785cd2f69..2056584903 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -31,8 +31,7 @@ GEM
activesupport (= 3.2.12)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activerecord-import (0.2.11)
- activerecord (~> 3.0)
+ activerecord-import (0.3.1)
activerecord (~> 3.0)
activeresource (3.2.12)
activemodel (= 3.2.12)
@@ -410,7 +409,7 @@ PLATFORMS
ruby
DEPENDENCIES
- activerecord-import (= 0.2.11)
+ activerecord-import (= 0.3.1)
acts-as-taggable-on (= 2.3.3)
acts_as_api (= 0.4.1)
addressable (= 2.3.2)
--
GitLab