aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3-2-9' into 3-2-stableSantiago Pastorino2012-11-091-1/+1
|\
| * Bump up to 3.2.9.rc3Santiago Pastorino2012-11-091-1/+1
| * Revert "Respect children paths filter settings"Santiago Pastorino2012-11-092-13/+6
* | Revert "Respect children paths filter settings"Santiago Pastorino2012-11-092-13/+6
* | Merge pull request #8027 from daenney/masterXavier Noria2012-11-081-1/+3
|/
* Bump to 3.2.9.rc2Santiago Pastorino2012-11-011-1/+1
* Merge pull request #8009 from graceliu/3-2-fix_database_url_supportRafael Mendonça França2012-10-292-0/+230
|\
| * fixed support for DATABASE_URL for rake db tasksGrace Liu2012-10-292-0/+230
* | Bump to 3.2.9.rc1Santiago Pastorino2012-10-291-2/+2
|/
* Revert "Deprecate Paths::Path#children which is unused now"Rafael Mendonça França2012-10-291-1/+0
* Deprecate Paths::Path#children which is unused nowElia Schito2012-10-291-0/+1
* Respect children paths filter settingsElia Schito2012-10-282-6/+13
* Add test case to assets eager loadRafael Mendonça França2012-10-271-0/+3
* Require ActionController::Railtie in the default middleware stack.Rafael Mendonça França2012-10-181-0/+2
* Backport 1a7049906ee6735bae058e9985a3806d08d9746bJeremy Kemper2012-10-061-3/+6
* Update supported ruby versions error message in ruby_version_check.rblihan2012-10-032-2/+6
* Merge pull request #6450 from iHiD/resource_generator_routes_masterRafael Mendonça França2012-10-013-7/+116
* Asset manifest includes aliases for foo.js -> foo/index.js and vice versa. Bu...Jeremy Kemper2012-09-301-1/+16
* Fix reference to code sample in Getting Started.Steve Klabnik2012-09-301-1/+1
* Hashrocket for 1.8 supportJeremy Kemper2012-09-281-2/+2
* Tune up Rails::Rack::Logger. Only put space between requests in development l...Jeremy Kemper2012-09-272-20/+29
* Log newlines separately to ensure the 'Started GET ...' line has a tag on the...Jeremy Kemper2012-09-271-1/+2
* Only apply log tags if the logger supports itJeremy Kemper2012-09-271-1/+1
* Explictly set the assets digest option to falseRafael Mendonça França2012-09-201-2/+5
* Add upgrading note to 3.1 release notes.Steve Klabnik2012-09-181-0/+122
* CHANGELOGs are now per branchXavier Noria2012-08-281-2384/+1
* We need to have 1-0-stable for joureny gem in edgeArun Agrawal2012-08-242-3/+4
* [guides] Add info about CHANGELOGs to contributing guidePiotr Sarnacki2012-08-111-0/+25
* Merge branch '3-2-8' into 3-2-stableSantiago Pastorino2012-08-092-2/+2
|\
| * Bump to 3.2.8Santiago Pastorino2012-08-091-1/+1
| * Add release date to CHANGELOGsSantiago Pastorino2012-08-091-1/+1
| * Bump to 3.2.8.rc2Santiago Pastorino2012-08-031-1/+1
| * html_escape should escape single quotesSantiago Pastorino2012-08-021-2/+2
| * Use `:data => { :confirm => "Text" }` syntax instead of `:confirm` atRafael Mendonça França2012-08-022-4/+9
* | Fix invalid asset compile assertionsJoshua Peek2012-08-071-3/+2
* | make assertions easier to track downAaron Patterson2012-08-071-9/+17
* | html_escape should escape single quotesSantiago Pastorino2012-08-021-2/+2
* | Use `:data => { :confirm => "Text" }` syntax instead of `:confirm` atRafael Mendonça França2012-08-022-4/+9
|/
* Bump to 3.2.8.rc1Santiago Pastorino2012-08-011-2/+2
* Revert "Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` op...Rafael Mendonça França2012-08-011-1/+1
* Add missing CHANGELOG entriesSantiago Pastorino2012-08-011-2/+6
* Merge pull request #7070 from jmazzi/3-2-stableRafael Mendonça França2012-08-011-3/+6
|\
| * Update documentation for Rails::Application#env_configJustin Mazzi2012-07-161-3/+6
* | Merge pull request #7147 from pferdefleisch/scaffold_controller_docsRafael Mendonça França2012-07-311-4/+3
* | Revert "Add update_columns and the suggestion of using update_columnsRafael Mendonça França2012-07-301-2/+0
* | Backport #6995 to 3-2 stableFrancesco Rodriguez2012-07-281-2/+2
* | Merge branch '3-2-rel' into 3-2-stableAaron Patterson2012-07-262-1/+6
|\ \
| * | updating release dateAaron Patterson2012-07-261-1/+1
| * | bumping to 3.2.7Aaron Patterson2012-07-261-1/+1
| * | updating the versionAaron Patterson2012-07-231-2/+2