aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Moss <me@jonathanmoss.me>2016-02-10 18:10:02 -0500
committerJon Moss <me@jonathanmoss.me>2016-02-22 20:46:11 -0500
commitcf423f8f767895d608284acb3543f7c9ba15ccf4 (patch)
tree356c0b41b384dbcaf1c22e26ee06ccac058507d2
parent83921b8f87495d5edb66f67549f0c169d2ea3e73 (diff)
downloadrails-cf423f8f767895d608284acb3543f7c9ba15ccf4.tar.gz
rails-cf423f8f767895d608284acb3543f7c9ba15ccf4.tar.bz2
rails-cf423f8f767895d608284acb3543f7c9ba15ccf4.zip
Add notes for future selves
Once RubyGems 2.5.0 is required, then the duplicated files can be removed, and symlinks can be used instead. [ci skip]
-rw-r--r--actioncable/lib/rails/generators/channel/channel_generator.rb1
-rw-r--r--activerecord/lib/rails/generators/active_record/model/model_generator.rb1
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'