From 07872c0473261cd468269da202dce7021f392341 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Fri, 27 May 2016 07:00:38 -0400 Subject: [PATCH 1/3] Upgraded mime-types gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4ed8fd6..38f261b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -171,7 +171,7 @@ GEM sqlite3 (~> 1.3) thin (~> 1.5.0) method_source (0.8.2) - mime-types (3.0) + mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mini_portile2 (2.0.0) From 71507e7000eecc1a044c3cf3cefd045d4a4aa91f Mon Sep 17 00:00:00 2001 From: Al Snow Date: Wed, 1 Jun 2016 06:43:44 -0400 Subject: [PATCH 2/3] Upgraded bundler and guard-rspec gems --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 38f261b..c3e9e92 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -130,7 +130,7 @@ GEM guard (~> 2.8) guard-compat (~> 1.0) multi_json (~> 1.8) - guard-rspec (4.7.0) + guard-rspec (4.7.1) guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) @@ -369,4 +369,4 @@ RUBY VERSION ruby 2.3.1p112 BUNDLED WITH - 1.12.3 + 1.12.5 From c3454288eb7e2e7b53579ab76e6e9cc58f9c54f3 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Wed, 1 Jun 2016 16:24:15 -0400 Subject: [PATCH 3/3] Fixed #238 and #239 (Removed rubocop and gauntlt refs) --- .overcommit.yml | 4 ---- Gemfile | 2 -- Gemfile.lock | 7 ------- 3 files changed, 13 deletions(-) diff --git a/.overcommit.yml b/.overcommit.yml index 14fa1d1..beb8964 100644 --- a/.overcommit.yml +++ b/.overcommit.yml @@ -16,10 +16,6 @@ # Uncomment the following lines to make the configuration take effect. PreCommit: - Rubocop: - enabled: true - on_warn: warn # fail # Treat all warnings as failures - TrailingWhitespace: enabled: true exclude: diff --git a/Gemfile b/Gemfile index 5db8cb4..5906ef8 100644 --- a/Gemfile +++ b/Gemfile @@ -32,8 +32,6 @@ group :development, :mysql do gem 'binding_of_caller' end -gem 'gauntlt' - gem 'simplecov', :require => false, :group => :test group :development, :test, :mysql do diff --git a/Gemfile.lock b/Gemfile.lock index c3e9e92..e7842b2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -104,11 +104,6 @@ GEM foreman (0.82.0) thor (~> 0.19.1) formatador (0.2.5) - gauntlt (0.1.4) - aruba - cucumber - nokogiri - trollop gherkin (3.2.0) globalid (0.3.6) activesupport (>= 4.1.0) @@ -303,7 +298,6 @@ GEM tilt (2.0.4) travis-lint (2.0.0) json - trollop (2.1.2) turbolinks (2.5.3) coffee-rails tzinfo (1.2.2) @@ -335,7 +329,6 @@ DEPENDENCIES database_cleaner execjs foreman - gauntlt guard-brakeman guard-livereload guard-rspec