diff options
author | Yuji Yaginuma <yuuji.yaginuma@gmail.com> | 2019-07-18 07:17:47 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-18 07:17:47 +0900 |
commit | c5a24c8ebba543687c11f893584618a20316fe34 (patch) | |
tree | 4e458dfd22e1830d1ff8ff17367ccaf49e4a998f /railties/lib | |
parent | 8d967534de4df1a5e487c0ff2f948e138fd883cb (diff) | |
parent | 6fec4c3a0aea3ef783372c55aff6d3c1efd89c4e (diff) | |
download | rails-c5a24c8ebba543687c11f893584618a20316fe34.tar.gz rails-c5a24c8ebba543687c11f893584618a20316fe34.tar.bz2 rails-c5a24c8ebba543687c11f893584618a20316fe34.zip |
Merge pull request #36603 from y-yagi/add_skip_collision_check_option
Add `skip-collision-check` option to generator
Diffstat (limited to 'railties/lib')
-rw-r--r-- | railties/lib/rails/generators/base.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/base.rb b/railties/lib/rails/generators/base.rb index 0b91e3223e..a153923ce3 100644 --- a/railties/lib/rails/generators/base.rb +++ b/railties/lib/rails/generators/base.rb @@ -20,6 +20,8 @@ module Rails class_option :skip_namespace, type: :boolean, default: false, desc: "Skip namespace (affects only isolated applications)" + class_option :skip_collision_check, type: :boolean, default: false, + desc: "Skip collision check" add_runtime_options! strict_args_position! @@ -249,6 +251,7 @@ module Rails # application or Ruby on Rails. def class_collisions(*class_names) return unless behavior == :invoke + return if options.skip_collision_check? class_names.flatten.each do |class_name| class_name = class_name.to_s @@ -261,8 +264,8 @@ module Rails if last && last.const_defined?(last_name.camelize, false) raise Error, "The name '#{class_name}' is either already used in your application " \ - "or reserved by Ruby on Rails. Please choose an alternative and run " \ - "this generator again." + "or reserved by Ruby on Rails. Please choose an alternative or use --skip-collision-check " \ + "to skip this check and run this generator again." end end end |