From c79b58876f1b07a04cef1b43cb4fcee2a650214c Mon Sep 17 00:00:00 2001 From: Cuong Tran Date: Thu, 11 Feb 2016 17:37:42 -0600 Subject: [PATCH 1/2] Replace SpaceAroundKeyword with SpaceAfterControlKeyword --- .rubocop_todo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 355b83a8b..6fe64817d 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -542,7 +542,7 @@ Style/SpaceAfterComma: # Offense count: 16 # Cop supports --auto-correct. -Style/SpaceAfterControlKeyword: +Style/SpaceAroundKeyword: Exclude: - 'spec/integration/common_validation.rb' - 'spec/integration/integration_spec.rb' From a1e2de1cae5e181681b9177751f231b851aa15ee Mon Sep 17 00:00:00 2001 From: Cuong Tran Date: Thu, 11 Feb 2016 17:44:01 -0600 Subject: [PATCH 2/2] FIx rubocop version to avoid accidental failures --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 6c5e96153..664a5737c 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,7 @@ group :development, :test do gem 'guard-rspec', require: false gem 'terminal-notifier-guard', require: false gem 'simplecov', require: false - gem 'rubocop', require: false unless RUBY_VERSION =~ /^1.8/ + gem 'rubocop', '~> 0.37.2', require: false unless RUBY_VERSION =~ /^1.8/ gem 'coveralls' gem 'codeclimate-test-reporter'