aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-04-03 07:00:21 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-04-03 07:00:21 -0700
commitb3efea8a6de1d7c4226c2781091079a6a3bef63f (patch)
tree78f8ace38029798dfbfbe30b0344f88d2b85ebad /railties/lib/rails
parent148b9ccbb537f99f35374a49aad929aebf8d6ff2 (diff)
parent2edf657a64ee74096e73fe2300e73c080a2e87e1 (diff)
downloadrails-b3efea8a6de1d7c4226c2781091079a6a3bef63f.tar.gz
rails-b3efea8a6de1d7c4226c2781091079a6a3bef63f.tar.bz2
rails-b3efea8a6de1d7c4226c2781091079a6a3bef63f.zip
Merge pull request #10074 from trevorturk/remove-fixme-comments-about-legacy-key-generator
Remove comments about removing LegacyKeyGenerator in 4.1
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/application.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 1a99e3beca..2d5aa9d952 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -1,6 +1,5 @@
require 'fileutils'
require 'active_support/core_ext/object/blank'
-# FIXME remove LegacyKeyGenerator and this require in 4.1
require 'active_support/key_generator'
require 'rails/engine'