diff --git a/Gemfile b/Gemfile index 434f8b3cb..39f4a1cdd 100644 --- a/Gemfile +++ b/Gemfile @@ -25,7 +25,7 @@ gem 'equivalent-xml', '~> 0.6.0' gem 'jquery-rails', '~> 4.3.1' gem 'rails_autolink', '~> 1.1.6' -gem 'qa', '~> 1.1.0' +gem 'qa', '~> 1.2.0' gem 'sprockets', '~> 2.12.4' # locked gem 'rack-dev-mark', '~> 0.7.5' diff --git a/Gemfile.lock b/Gemfile.lock index 189427449..a31b33900 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -57,7 +57,7 @@ GEM activemodel (= 4.2.10) activesupport (= 4.2.10) arel (~> 6.0) - activerecord-import (0.18.3) + activerecord-import (0.25.0) activerecord (>= 3.2) activerecord-postgresql-adapter (0.0.1) pg @@ -132,7 +132,7 @@ GEM tins (~> 1.6) crass (1.0.4) daemons (1.2.3) - deprecation (0.2.2) + deprecation (0.99.0) activesupport devise (3.5.6) bcrypt (~> 3.0) @@ -149,7 +149,7 @@ GEM nokogiri (>= 1.4.3) erubis (2.7.0) execjs (2.6.0) - faraday (0.12.1) + faraday (0.15.2) multipart-post (>= 1.2, < 3) fastercsv (1.5.5) ffi (1.9.10) @@ -262,7 +262,7 @@ GEM coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - qa (1.1.0) + qa (1.2.0) activerecord-import deprecation faraday @@ -466,7 +466,7 @@ DEPENDENCIES pg (~> 0.18.2) poltergeist (= 1.15.0) pry (~> 0.10.4) - qa (~> 1.1.0) + qa (~> 1.2.0) rack-dev-mark (~> 0.7.5) rails (~> 4.2.10) rails_autolink (~> 1.1.6)