diff options
| -rw-r--r-- | actioncable/lib/rails/generators/channel/channel_generator.rb | 1 | ||||
| -rw-r--r-- | activerecord/lib/rails/generators/active_record/model/model_generator.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/actioncable/lib/rails/generators/channel/channel_generator.rb b/actioncable/lib/rails/generators/channel/channel_generator.rb index c98b4ed829..6debe40c91 100644 --- a/actioncable/lib/rails/generators/channel/channel_generator.rb +++ b/actioncable/lib/rails/generators/channel/channel_generator.rb @@ -24,6 +24,7 @@ module Rails @_file_name ||= super.gsub(/\_channel/i, '') end + # FIXME: Change these files to symlinks once RubyGems 2.5.0 is required. def generate_application_cable_files return if self.behavior != :invoke diff --git a/activerecord/lib/rails/generators/active_record/model/model_generator.rb b/activerecord/lib/rails/generators/active_record/model/model_generator.rb index 09d3e7d9b9..179a4dc91e 100644 --- a/activerecord/lib/rails/generators/active_record/model/model_generator.rb +++ b/activerecord/lib/rails/generators/active_record/model/model_generator.rb @@ -39,6 +39,7 @@ module ActiveRecord attributes.select { |a| !a.reference? && a.has_index? } end + # FIXME: Change this file to a symlink once RubyGems 2.5.0 is required. def generate_application_record if self.behavior == :invoke && !File.exist?('app/models/application_record.rb') template 'application_record.rb', 'app/models/application_record.rb' |