aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/CHANGELOG2
-rw-r--r--railties/lib/rails/version.rb (renamed from railties/lib/rails_version.rb)0
2 files changed, 2 insertions, 0 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 3e661e527b..6abdbf8347 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Make Rails::VERSION implicitly loadable. Closes #4491. [Nicholas Seckar]
+
* Teach Rails apps to only load gems of the same Rails version they were generated with. [Nicholas Seckar]
* Added expiration settings for JavaScript, CSS, HTML, and images to default lighttpd.conf [DHH]
diff --git a/railties/lib/rails_version.rb b/railties/lib/rails/version.rb
index d48ace3a20..d48ace3a20 100644
--- a/railties/lib/rails_version.rb
+++ b/railties/lib/rails/version.rb