From: Andy Allan <git@gravitystorm.co.uk>
Date: Sun, 22 Oct 2017 21:35:34 +0000 (+0100)
Subject: Rubocop fixes
X-Git-Tag: live~3287^2
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4d406fcdfd9b0b50b1bc9c53d26ca91cd5944532?hp=b2a8df0bd73f1031dcf4684e084897a28b117345;ds=sidebyside

Rubocop fixes
---

diff --git a/Gemfile b/Gemfile
index 319a25db6..8387097fe 100644
--- a/Gemfile
+++ b/Gemfile
@@ -104,9 +104,9 @@ gem "logstasher"
 
 # Gems useful for development
 group :development do
+  gem "annotate"
   gem "listen"
   gem "vendorer"
-  gem "annotate"
 end
 
 # Gems needed for running tests
diff --git a/lib/tasks/auto_annotate_models.rake b/lib/tasks/auto_annotate_models.rake
index 4bca64f1c..53252b769 100644
--- a/lib/tasks/auto_annotate_models.rake
+++ b/lib/tasks/auto_annotate_models.rake
@@ -6,41 +6,41 @@ if Rails.env.development?
     # You can override any of these by setting an environment variable of the
     # same name.
     Annotate.set_defaults(
-      'routes'                  => 'false',
-      'position_in_routes'      => 'before',
-      'position_in_class'       => 'before',
-      'position_in_test'        => 'before',
-      'position_in_fixture'     => 'before',
-      'position_in_factory'     => 'before',
-      'position_in_serializer'  => 'before',
-      'show_foreign_keys'       => 'true',
-      'show_indexes'            => 'true',
-      'simple_indexes'          => 'false',
-      'model_dir'               => 'app/models',
-      'root_dir'                => '',
-      'include_version'         => 'false',
-      'require'                 => '',
-      'exclude_tests'           => 'true',
-      'exclude_fixtures'        => 'true',
-      'exclude_factories'       => 'true',
-      'exclude_serializers'     => 'true',
-      'exclude_scaffolds'       => 'true',
-      'exclude_controllers'     => 'true',
-      'exclude_helpers'         => 'true',
-      'ignore_model_sub_dir'    => 'false',
-      'ignore_columns'          => nil,
-      'ignore_routes'           => nil,
-      'ignore_unknown_models'   => 'false',
-      'hide_limit_column_types' => 'integer,boolean',
-      'skip_on_db_migrate'      => 'false',
-      'format_bare'             => 'true',
-      'format_rdoc'             => 'false',
-      'format_markdown'         => 'false',
-      'sort'                    => 'false',
-      'force'                   => 'false',
-      'trace'                   => 'false',
-      'wrapper_open'            => nil,
-      'wrapper_close'           => nil
+      "routes"                  => "false",
+      "position_in_routes"      => "before",
+      "position_in_class"       => "before",
+      "position_in_test"        => "before",
+      "position_in_fixture"     => "before",
+      "position_in_factory"     => "before",
+      "position_in_serializer"  => "before",
+      "show_foreign_keys"       => "true",
+      "show_indexes"            => "true",
+      "simple_indexes"          => "false",
+      "model_dir"               => "app/models",
+      "root_dir"                => "",
+      "include_version"         => "false",
+      "require"                 => "",
+      "exclude_tests"           => "true",
+      "exclude_fixtures"        => "true",
+      "exclude_factories"       => "true",
+      "exclude_serializers"     => "true",
+      "exclude_scaffolds"       => "true",
+      "exclude_controllers"     => "true",
+      "exclude_helpers"         => "true",
+      "ignore_model_sub_dir"    => "false",
+      "ignore_columns"          => nil,
+      "ignore_routes"           => nil,
+      "ignore_unknown_models"   => "false",
+      "hide_limit_column_types" => "integer,boolean",
+      "skip_on_db_migrate"      => "false",
+      "format_bare"             => "true",
+      "format_rdoc"             => "false",
+      "format_markdown"         => "false",
+      "sort"                    => "false",
+      "force"                   => "false",
+      "trace"                   => "false",
+      "wrapper_open"            => nil,
+      "wrapper_close"           => nil
     )
   end