bundle update: use stable activerecord-import

3 files changed, 53 insertions, 57 deletions

diff --git a/Gemfile b/Gemfile
index 80205e2..595e35c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 4.2.0"
-gem "activerecord-import", github: "zdennis/activerecord-import"
+gem "activerecord-import"
 gem "tzinfo-data"
 gem "mysql2"
 gem "settingslogic"
diff --git a/Gemfile.lock b/Gemfile.lock
index e12d937..620445c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,3 @@
-GIT
-  remote: git://github.com/zdennis/activerecord-import.git
-  revision: 2e8f19ee9aefc9e43eebf4c91697e918d11b8747
-  specs:
-    activerecord-import (0.7.0)
-      activerecord (>= 3.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -37,15 +30,17 @@ GEM
       activemodel (= 4.2.0)
       activesupport (= 4.2.0)
       arel (~> 6.0)
+    activerecord-import (0.7.0)
+      activerecord (>= 3.0)
     activesupport (4.2.0)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.6)
+    addressable (2.3.7)
     arel (6.0.0)
-    autoprefixer-rails (5.0.0.3)
+    autoprefixer-rails (5.1.7)
       execjs
       json
     axiom-types (0.1.1)
@@ -74,12 +69,12 @@ GEM
     coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.8.0)
+    coffee-script-source (1.9.1)
     columnize (0.9.0)
     cool.io (1.2.4)
-    coveralls (0.7.3)
+    coveralls (0.7.11)
       multi_json (~> 1.10)
-      rest-client (~> 1.7)
+      rest-client (>= 1.6.8, < 2)
       simplecov (~> 0.9.1)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
@@ -94,8 +89,8 @@ GEM
     docile (1.1.5)
     equalizer (0.0.9)
     erubis (2.7.0)
-    eventmachine (1.0.4)
-    execjs (2.2.2)
+    eventmachine (1.0.7)
+    execjs (2.3.0)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.5.0)
@@ -106,7 +101,7 @@ GEM
     ffi (1.9.6)
     formatador (0.2.5)
     get_process_mem (0.2.0)
-    globalid (0.3.0)
+    globalid (0.3.3)
       activesupport (>= 4.1.0)
     grape (0.9.0)
       activesupport
@@ -118,12 +113,12 @@ GEM
       rack-accept
       rack-mount
       virtus (>= 1.0.0)
-    grape-rabl (0.3.0)
+    grape-rabl (0.3.1)
       grape
       i18n
       rabl
       tilt
-    guard (2.11.1)
+    guard (2.12.4)
       formatador (>= 0.2.4)
       listen (~> 2.7)
       lumberjack (~> 1.0)
@@ -139,7 +134,7 @@ GEM
       rspec (>= 2.99.0, < 4.0)
     haml (4.0.6)
       tilt
-    haml-rails (0.7.0)
+    haml-rails (0.8.2)
       actionpack (>= 4.0.1)
       activesupport (>= 4.0.1)
       haml (>= 3.1, < 5.0)
@@ -179,20 +174,20 @@ GEM
     mime-types (2.4.3)
     mini_portile (0.6.2)
     minitest (5.5.1)
-    msgpack (0.5.10)
+    msgpack (0.5.11)
     msgpack-rpc (0.5.3)
       cool.io (~> 1.2.4)
       msgpack (~> 0.5.10)
     multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    mysql2 (0.3.17)
+    mysql2 (0.3.18)
     naught (1.0.0)
     nenv (0.2.0)
-    netrc (0.10.2)
+    netrc (0.10.3)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    notiffany (0.0.3)
+    notiffany (0.0.6)
       nenv (~> 0.1)
       shellany (~> 0.0)
     oauth (0.4.7)
@@ -209,11 +204,11 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-rails (0.3.2)
+    pry-rails (0.3.3)
       pry (>= 0.9.10)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
-    rabl (0.11.5)
+    rabl (0.11.6)
       activesupport (>= 2.3.14)
     rack (1.6.0)
     rack-accept (0.4.5)
@@ -251,33 +246,34 @@ GEM
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rest-client (1.7.2)
+    rest-client (1.7.3)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.1)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-rails (3.1.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-rails (3.2.1)
+      actionpack (>= 3.0, < 4.3)
+      activesupport (>= 3.0, < 4.3)
+      railties (>= 3.0, < 4.3)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
     ruby_parser (3.6.4)
       sexp_processor (~> 4.1)
     safe_yaml (1.0.4)
-    sass (3.4.10)
+    sass (3.4.13)
     sass-rails (5.0.1)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
@@ -288,13 +284,13 @@ GEM
     sexp_processor (4.4.5)
     shellany (0.0.1)
     simple_oauth (0.3.1)
-    simplecov (0.9.1)
+    simplecov (0.9.2)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
+      simplecov-html (~> 0.9.0)
+    simplecov-html (0.9.0)
     slop (3.6.0)
-    spring (1.2.0)
+    spring (1.3.3)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
     sprockets (2.12.3)
@@ -313,10 +309,10 @@ GEM
     tilt (1.4.1)
     timers (4.0.1)
       hitimes
-    tins (1.3.3)
+    tins (1.3.4)
     turbolinks (2.5.3)
       coffee-rails
-    twitter (5.13.0)
+    twitter (5.14.0)
       addressable (~> 2.3)
       buftok (~> 0.2.0)
       equalizer (~> 0.0.9)
@@ -327,11 +323,11 @@ GEM
       memoizable (~> 0.4.0)
       naught (~> 1.0)
       simple_oauth (~> 0.3.0)
-    twitter-text (1.10.0)
+    twitter-text (1.11.0)
       unf (~> 0.1.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2014.10)
+    tzinfo-data (1.2015.1)
       tzinfo (>= 1.0.0)
     uglifier (2.7.0)
       execjs (>= 0.3.0)
@@ -366,7 +362,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord-import!
+  activerecord-import
   bootstrap-sass
   byebug
   coveralls
diff --git a/worker_node/Gemfile.lock b/worker_node/Gemfile.lock
index d3e68fb..3dc72c8 100644
--- a/worker_node/Gemfile.lock
+++ b/worker_node/Gemfile.lock
@@ -7,9 +7,9 @@ GEM
       eventmachine (~> 1.0)
       http_parser.rb (~> 0.6)
       simple_oauth (~> 0.2)
-    eventmachine (1.0.4)
+    eventmachine (1.0.7)
     http_parser.rb (0.6.0)
-    msgpack (0.5.10)
+    msgpack (0.5.11)
     rake (10.4.2)
     simple_oauth (0.3.1)
     yajl-ruby (1.2.1)