From f1065c8127848d2687679d1572ec74aa754fc3a4 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@online.de>
Date: Sun, 14 Aug 2016 09:24:20 +0200
Subject: [PATCH] Bump activerecord-import
---
Gemfile | 2 +-
Gemfile.lock | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Gemfile b/Gemfile
index 946973ab1f..0a4fe57a65 100644
--- a/Gemfile
+++ b/Gemfile
@@ -70,7 +70,7 @@ group :postgresql, optional: true do
end
-gem "activerecord-import", "0.13.0"
+gem "activerecord-import", "0.15.0"
# File uploading
diff --git a/Gemfile.lock b/Gemfile.lock
index 72f632412d..6d27df2f6e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -34,8 +34,8 @@ GEM
activemodel (= 4.2.7.1)
activesupport (= 4.2.7.1)
arel (~> 6.0)
- activerecord-import (0.13.0)
- activerecord (>= 3.0)
+ activerecord-import (0.15.0)
+ activerecord (>= 3.2)
activesupport (4.2.7.1)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
@@ -913,7 +913,7 @@ PLATFORMS
DEPENDENCIES
active_model_serializers (= 0.9.5)
- activerecord-import (= 0.13.0)
+ activerecord-import (= 0.15.0)
acts-as-taggable-on (= 3.5.0)
acts_as_api (= 0.4.2)
addressable (= 2.3.8)
--
GitLab