aboutsummaryrefslogtreecommitdiffstats
path: root/railties/CHANGELOG.md
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2013-02-01 21:27:06 -0800
committerGuillermo Iguaran <guilleiguaran@gmail.com>2013-02-01 21:27:06 -0800
commit9cb386d9d6af513ca09b55df7765e3d38488e2ff (patch)
tree1bed8850e33f15a7f30ef3d262bdd6862e332d58 /railties/CHANGELOG.md
parent3e1f23125dc04df7894f276f6e3d296e184c2b8c (diff)
parent5f1dc8e3b74d4f4deb0617be6190a32256f4fe18 (diff)
downloadrails-9cb386d9d6af513ca09b55df7765e3d38488e2ff.tar.gz
rails-9cb386d9d6af513ca09b55df7765e3d38488e2ff.tar.bz2
rails-9cb386d9d6af513ca09b55df7765e3d38488e2ff.zip
Merge pull request #9147 from amparo-luna/custom_rc
Add --rc option to support the load of a custom rc file
Diffstat (limited to 'railties/CHANGELOG.md')
-rw-r--r--railties/CHANGELOG.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 0a9c4a4984..f86baee4c3 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,5 +1,9 @@
## Rails 4.0.0 (unreleased) ##
+* Add --rc option to support the load of a custom rc file during the generation of a new app.
+
+ *Amparo Luna*
+
* Add --no-rc option to skip the loading of railsrc file during the generation of a new app.
*Amparo Luna*