Merge remote-tracking branch 'upstream/pull/3324'

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 0a7edc2a536dd208f60e49d9d3ac9c3cf877a5ef..90bfaa8f9d77c2844f061eae784d4bc503120953 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -140,12 +140,6 @@ Rails/BulkChangeTable:
     - 'db/migrate/20120208194454_add_domain_to_acl.rb'
     - 'db/migrate/20120404205604_add_user_and_description_to_redaction.rb'
 
-# Offense count: 43
-# Cop supports --auto-correct.
-Rails/ContentTag:
-  Exclude:
-    - 'test/lib/locale_test.rb'
-
 # Offense count: 2
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb

diff --git a/Gemfile b/Gemfile
index 6b1049ec7386ad4481c317ad7ec9d8c223b46b54..75cb1054bb0ced0350e7e2b4dc4ccde399f2bf5f 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -145,7 +145,7 @@ group :test do
   gem "rubocop"
   gem "rubocop-minitest"
   gem "rubocop-performance"
-  gem "rubocop-rails"
+  gem "rubocop-rails", "~> 2.11.3" # Bug in 2.12.0, fixed in master after 2.12.2
   gem "rubocop-rake"
   gem "selenium-webdriver"
   gem "simplecov", :require => false

diff --git a/Gemfile.lock b/Gemfile.lock
index 211e673cd6af9b9ed7bcbaf3b83f4dc0d13ebc1b..4daf0bb81542f1763b40e1634012d3d2fe5e22a6 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -421,7 +421,7 @@ GEM
     rubocop-performance (1.11.5)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.12.2)
+    rubocop-rails (2.11.3)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.7.0, < 2.0)
@@ -560,7 +560,7 @@ DEPENDENCIES
   rubocop
   rubocop-minitest
   rubocop-performance
-  rubocop-rails
+  rubocop-rails (~> 2.11.3)
   rubocop-rake
   sanitize
   sassc-rails