From 710295621f8af5e22f6111262a781d7fa21321b2 Mon Sep 17 00:00:00 2001 From: Georg Kahest Date: Sun, 9 Apr 2017 21:38:25 +0300 Subject: [PATCH] unlock bundler-audit, change order of gems in test --- Gemfile | 11 ++++------- Gemfile.lock | 14 ++++---------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/Gemfile b/Gemfile index 5f88cada2..d20880d7f 100644 --- a/Gemfile +++ b/Gemfile @@ -138,12 +138,9 @@ group :development, :test do gem 'pry', '0.10.1' # code review -# gem 'simplecov', '0.10.0', require: false gem 'rubycritic', '3.2.0' gem 'bullet', '4.14.7' # for finding database optimizations - gem 'bundler-audit', - github: 'rubysec/bundler-audit', - ref: 'f89ef7fae1090bbad825ea76812d56d72b417055' # for finding future vulnerable gems + gem 'bundler-audit' gem 'brakeman', '3.6.1', require: false # for security audit' # tmp, otherwise conflics with breakman # gem 'html2haml', github: 'haml/html2haml', ref: '6984f50bdbbd6291535027726a5697f28778ee8d' @@ -162,8 +159,8 @@ end group :test do gem 'database_cleaner' - gem 'factory_girl_rails' - gem 'webmock' - gem 'simplecov' + gem 'factory_girl_rails' gem 'codeclimate-test-reporter', "~> 1.0.0" + gem 'simplecov' + gem 'webmock' end diff --git a/Gemfile.lock b/Gemfile.lock index 24299fb8c..c314d836d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -44,15 +44,6 @@ GIT que (~> 0.6) rails (>= 4.0) -GIT - remote: https://github.com/rubysec/bundler-audit.git - revision: f89ef7fae1090bbad825ea76812d56d72b417055 - ref: f89ef7fae1090bbad825ea76812d56d72b417055 - specs: - bundler-audit (0.4.0) - bundler (~> 1.2) - thor (~> 0.18) - GIT remote: https://github.com/tarmotalu/digidoc_client.git revision: 1645e83a5a548addce383f75703b0275c5310c32 @@ -137,6 +128,9 @@ GEM bullet (4.14.7) activesupport (>= 3.0.0) uniform_notifier (~> 1.9.0) + bundler-audit (0.5.0) + bundler (~> 1.2) + thor (~> 0.18) cancancan (1.11.0) capybara (2.4.4) mime-types (>= 1.16) @@ -572,7 +566,7 @@ DEPENDENCIES bootstrap-sass (= 3.3.5.1) brakeman (= 3.6.1) bullet (= 4.14.7) - bundler-audit! + bundler-audit cancancan (= 1.11.0) capybara (= 2.4.4) codeclimate-test-reporter (~> 1.0.0)