From fba85318c018ea22b76f5bc4f6975bfb44057daf Mon Sep 17 00:00:00 2001 From: Richard Stec Date: Thu, 13 Jun 2019 19:32:26 +0200 Subject: [PATCH] fix bundle exec annotate doesnt run on models, just routes --- lib/annotate.rb | 4 ++-- lib/generators/annotate/templates/auto_annotate_models.rake | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/annotate.rb b/lib/annotate.rb index 27e585773..e246ec19d 100644 --- a/lib/annotate.rb +++ b/lib/annotate.rb @@ -38,7 +38,7 @@ module Annotate OTHER_OPTIONS = [ :ignore_columns, :skip_on_db_migrate, :wrapper_open, :wrapper_close, :wrapper, :routes, :hide_limit_column_types, :hide_default_column_types, - :ignore_routes, :active_admin + :ignore_routes, :active_admin, :models ].freeze PATH_OPTIONS = [ :require, :model_dir, :root_dir @@ -114,7 +114,7 @@ def self.include_routes? end def self.include_models? - ENV['routes'] !~ TRUE_RE + ENV['models'] =~ TRUE_RE end def self.loaded_tasks=(val) diff --git a/lib/generators/annotate/templates/auto_annotate_models.rake b/lib/generators/annotate/templates/auto_annotate_models.rake index eea2aa859..3a903362a 100644 --- a/lib/generators/annotate/templates/auto_annotate_models.rake +++ b/lib/generators/annotate/templates/auto_annotate_models.rake @@ -7,6 +7,7 @@ if Rails.env.development? # You can override any of these by setting an environment variable of the # same name. Annotate.set_defaults( + 'models' => 'true', 'routes' => 'false', 'position_in_routes' => 'before', 'position_in_class' => 'before',