aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update actionpack/CHANGELOG.mdRafael Mendonça França2013-02-061-4/+4
* Merge pull request #9039 from senny/warn_on_controller_option_with_ruby_const...Rafael Mendonça França2013-02-064-9/+72
|\
| * ruby constant syntax is not supported as routing `:controller` option.Yves Senn2013-02-064-9/+72
|/
* Update .gitignoreJosé Valim2013-02-051-2/+0
* Enable hstore extensions on tests if it is not enabled and database supports itRafael Mendonça França2013-02-051-1/+8
* Merge pull request #9192 from adammck/ignore-dot-ruby-versionRafael Mendonça França2013-02-051-0/+1
|\
| * Ignore .ruby-versionAdam Mckaig2013-02-051-0/+1
|/
* Merge pull request #9178 from robertomiranda/best-standard-support-guideCarlos Antonio da Silva2013-02-041-0/+2
|\
| * Update upgrading guide with ActionDispatch::BestStandardsSupport removalrobertomiranda2013-02-041-0/+2
* | Merge pull request #9177 from zenspider/masterAaron Patterson2013-02-041-0/+12
|\ \ | |/ |/|
| * Added test:all and test:all:db tasks to speed up full test runs.Ryan Davis2013-02-041-0/+12
|/
* Merge pull request #9175 from robertomiranda/add--rc-descGuillermo Iguaran2013-02-041-0/+3
|\
| * Add --rc description on the command linerobertomiranda2013-02-041-0/+3
* | Merge pull request #9174 from robertomiranda/railsrc-cli-optionRafael Mendonça França2013-02-041-2/+6
|\ \ | |/ |/|
| * Use --rc= instead of --rcrobertomiranda2013-02-041-2/+6
|/
* Merge pull request #8520 from senny/8516_assert_template_with_localsCarlos Antonio da Silva2013-02-046-3/+46
|\
| * partials inside directory work with `assert_template`Yves Senn2013-02-046-3/+30
| * descriptive `assert_template` error when partial wasn't renderedYves Senn2013-02-043-0/+16
|/
* Take care of whitespaces and changing the hash syntaxRafael Mendonça França2013-02-041-57/+56
* Merge pull request #9152 from dahakawang/masterAaron Patterson2013-02-031-0/+8
|\
| * test for issue 8931David2013-02-021-0/+8
* | Merge pull request #9164 from yuki24/put_rdoc_at_the_end_of_RUNNING_UNIT_TESTSXavier Noria2013-02-032-0/+0
|\ \
| * | Put .rdoc at the end of the files named RUNNING_UNIT_TESTSYuki Nishijima2013-02-032-0/+0
|/ /
* | Merge pull request #9154 from robertomiranda/add-rc-descGuillermo Iguaran2013-02-021-0/+3
|\ \
| * | Add --no-rc description on the command linerobertomiranda2013-02-021-0/+3
|/ /
* | Merge pull request #9151 from gogogarrett/patch-1Rafael Mendonça França2013-02-021-1/+1
|\ \
| * | Fix link to point to new RefineryCMS repoGarrett Heinlen2013-02-011-1/+1
| |/
* | Merge remote-tracking branch 'docrails/master'Xavier Noria2013-02-023-5/+5
|\ \
| * | Revert "Detail middleware initialization points in the initialization guide [...Xavier Noria2013-02-021-74/+1
| * | Fix formatting: ruby->erb. [ci skip]Nicholas Schultz-Møller2013-01-311-3/+3
| * | Typo in codemanishval2013-01-291-1/+1
| * | Merge pull request #125 from manishval/fix-typo-in-rails-guidemanishval2013-01-261-1/+1
| |\ \
| | * | Fix typo in rails plugins guideManish Valechha2013-01-271-1/+1
| |/ /
| * | Detail middleware initialization points in the initialization guide [ci skip]Michael de Silva2013-01-271-1/+74
* | | Refactor --rc optionGuillermo Iguaran2013-02-021-6/+1
* | | Merge pull request #9147 from amparo-luna/custom_rcGuillermo Iguaran2013-02-012-1/+11
|\ \ \ | |_|/ |/| |
| * | Add --rc option to support the load of a custom rc fileAmparo Luna2013-02-012-1/+11
* | | Merge pull request #9149 from robertomiranda/remove-ref-best-standards-supportGuillermo Iguaran2013-02-013-10/+3
|\ \ \
| * | | Remove BestStandardsSupport referencesrobertomiranda2013-02-013-10/+3
|/ / /
* | | Fix markdown syntax in actionpack CHANGELOG.Steve Klabnik2013-02-011-1/+2
* | | Added extra note about when to email other rubies to RELEASING_RAILS.rdocSteve Klabnik2013-02-011-0/+3
|/ /
* | Prefer File.read over File.open.readAkira Matsuda2013-02-011-1/+1
* | --no-rc in the railties testsAkira Matsuda2013-02-012-2/+2
* | Missing require hash/keysAkira Matsuda2013-02-012-0/+3
* | Missing or unneeded require extract_optionsAkira Matsuda2013-02-0110-1/+10
* | Merge pull request #9138 from amparo-luna/no_rcRafael Mendonça França2013-01-312-6/+12
|\ \
| * | Add --no-rc option to skip the loading of railsrc fileAmparo Luna2013-01-312-6/+12
|/ /
* | Fix typo :bomb:Rafael Mendonça França2013-01-311-1/+1
* | Fix typoRafael Mendonça França2013-01-311-2/+2
* | Merge pull request #9133 from homakov/patch-6Rafael Mendonça França2013-01-311-1/+1
|\ \