diff --git a/.rubocop.yml b/.rubocop.yml index 2b64b50e39..1cd04a6a1a 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -167,7 +167,7 @@ Style/StringLiterals: EnforcedStyle: double_quotes # Detect hard tabs, no hard tabs. -Layout/Tab: +Layout/IndentationStyle: Enabled: true # Empty lines should not have any spaces. diff --git a/Gemfile.lock b/Gemfile.lock index 6a8498c974..071cb8463e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -347,7 +347,7 @@ GEM mini_portile2 (~> 2.4.0) os (1.0.1) parallel (1.19.1) - parser (2.7.0.2) + parser (2.7.1.1) ast (~> 2.4.0) path_expander (1.1.0) pg (1.2.3) @@ -406,18 +406,19 @@ GEM resque (>= 1.26) rufus-scheduler (~> 3.2) retriable (3.1.2) - rexml (3.2.3) - rubocop (0.80.0) + rexml (3.2.4) + rubocop (0.82.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.7.0.1) rainbow (>= 2.2.2, < 4.0) rexml ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.7) + unicode-display_width (>= 1.4.0, < 2.0) rubocop-performance (1.5.2) rubocop (>= 0.71.0) - rubocop-rails (2.4.1) + rubocop-rails (2.5.2) + activesupport rack (>= 1.1) rubocop (>= 0.72.0) ruby-progressbar (1.10.1) @@ -500,7 +501,7 @@ GEM uber (0.1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (1.6.1) + unicode-display_width (1.7.0) useragent (0.16.10) vegas (0.1.11) rack (>= 1.0.0)