From af0415c94900ac37dacf6979d7eed64c75c63b9e Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Tue, 5 Jun 2018 05:09:25 +0300 Subject: [PATCH 1/5] Remove "bundler-audit" gem --- Gemfile | 1 - Gemfile.lock | 4 ---- 2 files changed, 5 deletions(-) diff --git a/Gemfile b/Gemfile index 0af80fddf..c77fc212e 100644 --- a/Gemfile +++ b/Gemfile @@ -120,7 +120,6 @@ group :development, :test do gem 'pry', '0.10.1' gem 'bullet', '4.14.7' # for finding database optimizations - 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' diff --git a/Gemfile.lock b/Gemfile.lock index b12b28a2d..ae8676ede 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -128,9 +128,6 @@ 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.14.0) addressable @@ -482,7 +479,6 @@ DEPENDENCIES bootstrap-sass (= 3.3.5.1) brakeman (= 3.6.1) bullet (= 4.14.7) - bundler-audit cancancan (= 1.11.0) capybara coderay (= 1.1.0) From 5441424e456a212004fa0b3bec0fcd7f84f3d8df Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Tue, 5 Jun 2018 05:11:06 +0300 Subject: [PATCH 2/5] Remove "brakeman" gem --- Gemfile | 3 --- Gemfile.lock | 2 -- 2 files changed, 5 deletions(-) diff --git a/Gemfile b/Gemfile index c77fc212e..2d10b744d 100644 --- a/Gemfile +++ b/Gemfile @@ -120,9 +120,6 @@ group :development, :test do gem 'pry', '0.10.1' gem 'bullet', '4.14.7' # for finding database optimizations - gem 'brakeman', '3.6.1', require: false # for security audit' - # tmp, otherwise conflics with breakman - # gem 'html2haml', github: 'haml/html2haml', ref: '6984f50bdbbd6291535027726a5697f28778ee8d' gem 'html2haml', '2.1.0' gem 'sdoc', '0.4.1' # bundle exec rake doc:rails generates the API under doc/api. gem 'railroady', '1.3.0' # to generate database diagrams diff --git a/Gemfile.lock b/Gemfile.lock index ae8676ede..0782f93f6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -123,7 +123,6 @@ GEM bootstrap-sass (3.3.5.1) autoprefixer-rails (>= 5.0.0.1) sass (>= 3.3.0) - brakeman (3.6.1) builder (3.2.3) bullet (4.14.7) activesupport (>= 3.0.0) @@ -477,7 +476,6 @@ DEPENDENCIES airbrake autodoc bootstrap-sass (= 3.3.5.1) - brakeman (= 3.6.1) bullet (= 4.14.7) cancancan (= 1.11.0) capybara From cd107916bc6d20ce4107965429202de9c4cfe566 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sat, 9 Jun 2018 05:23:55 +0300 Subject: [PATCH 3/5] Update CodeClimate config --- .codeclimate.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.codeclimate.yml b/.codeclimate.yml index 9df308022..be8f1df7a 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -23,6 +23,7 @@ exclude_patterns: - "bin/" - "config/" - "db/" + - "lib/" - "vendor/" - "test/" - "spec/" From 3b996a5636598545495151626e1e784dd144d840 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 18 Jun 2018 16:49:51 +0300 Subject: [PATCH 4/5] Update CodeClimate config --- .codeclimate.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.codeclimate.yml b/.codeclimate.yml index be8f1df7a..f527cd0e3 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -20,6 +20,7 @@ plugins: rubocop: enabled: true exclude_patterns: + - "app/models/legacy/" - "bin/" - "config/" - "db/" From 70cc25e3a8ed5a6365cfba390c691a59956962d1 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 18 Jun 2018 17:08:59 +0300 Subject: [PATCH 5/5] Revert "Update CodeClimate config" This reverts commit 3b996a5636598545495151626e1e784dd144d840. --- .codeclimate.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.codeclimate.yml b/.codeclimate.yml index f527cd0e3..be8f1df7a 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -20,7 +20,6 @@ plugins: rubocop: enabled: true exclude_patterns: - - "app/models/legacy/" - "bin/" - "config/" - "db/"