aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* don't pass unnecessary argumentSergey Nartimov2012-03-021-2/+2
* Merge pull request #5242 from rails/opt_routesJosé Valim2012-03-029-48/+107
|\
| * Optimize url helpers.Sergey Nartimov + José Valim2012-03-026-29/+36
| * Optimize path helpers.José Valim2012-03-025-29/+81
* | Fix #5238, rendered_format is not set when template is not renderedPiotr Sarnacki2012-03-022-2/+8
* | Merge pull request #5241 from carlosantoniodasilva/output-safetyJosé Valim2012-03-021-3/+1
|\ \
| * | Stop SafeBuffer#clone_empty from issuing warningsCarlos Antonio da Silva2012-03-021-3/+1
|/ /
* | Merge pull request #5234 from benpickles/allow-empty-fieldsetsPiotr Sarnacki2012-03-022-2/+11
|\ \ | |/ |/|
| * Allow fieldsets to be created without a block.Ben Pickles2012-03-012-2/+11
* | revert setting NOT NULL constraints in add_timestampsXavier Noria2012-03-011-2/+2
|/
* Merge pull request #5232 from claudiob/add_release_date_to_docsVijay Dev2012-03-016-12/+12
|\
| * Add release dates to documentationclaudiob2012-03-016-12/+12
|/
* Merge branch 'master-security'Aaron Patterson2012-03-015-29/+63
|\
| * Ensure [] respects the status of the buffer.José Valim2012-02-292-16/+41
| * delete vulnerable AS::SafeBuffer#[]Akira Matsuda2012-02-202-12/+0
| * use AS::SafeBuffer#clone_empty for flushing the output_bufferAkira Matsuda2012-02-201-1/+1
| * add AS::SafeBuffer#clone_emptyAkira Matsuda2012-02-202-0/+15
| * fix output safety issue with select optionsSergey Nartimov2012-02-202-4/+11
* | Tap, tap goes the middlewareJeremy Kemper2012-02-291-4/+1
* | Merge pull request #5203 from avakhov/anonymous-controller-layoutAaron Patterson2012-02-292-0/+16
|\ \
| * | Fix layout lookup for anonymous controllerAlexey Vakhov2012-02-282-0/+16
* | | Merge pull request #5219 from mattfawcett/2781-fix-querystring-route-constrai...Aaron Patterson2012-02-293-4/+17
|\ \ \
| * | | Fix the assert_recognizes test method so that it works when there areMatt Fawcett2012-02-243-4/+17
* | | | fix api doc [ci skip]Vijay Dev2012-03-011-1/+1
* | | | adds a nodoc [ci skip]Vijay Dev2012-03-011-1/+1
* | | | Merge pull request #5221 from kennyj/fix_warning_20120301Jeremy Kemper2012-02-291-3/+0
|\ \ \ \
| * | | | Fix warning: assigned but unused variablekennyj2012-03-011-3/+0
|/ / / /
* | | | reduced localhost check to two method callsAaron Patterson2012-02-281-2/+3
* | | | Merge pull request #5214 from bdurand/fix_session_cache_store_requireJeremy Kemper2012-02-281-1/+0
|\ \ \ \
| * | | | remove unnecessary memcache equire in ActionDispatch::Session::CacheStoreBrian Durand2012-02-281-1/+0
|/ / / /
* | | | Merge pull request #5212 from MarkMT/masterXavier Noria2012-02-281-8/+19
|\ \ \ \
| * | | | Modified comments explaining what the update_only option does.Mark2012-02-281-8/+19
* | | | | Merge pull request #5208 from ysoslow/ef79b8400f064361b2dbe1ee89f42d2adc103a3cAaron Patterson2012-02-281-5/+3
|\ \ \ \ \
| * | | | | Inflector/constantize - inject method lets us to avoid using another variablehoma2012-02-281-5/+3
| | |_|/ / | |/| | |
* | | | | Merge pull request #5196 from lest/patch-3José Valim2012-02-282-0/+14
|\ \ \ \ \
| * | | | | force datetime attributes to be changed, fix GH #3965Sergey Nartimov2012-02-282-0/+14
* | | | | | minor edits [ci skip]Vijay Dev2012-02-281-2/+2
* | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-02-284-2/+20
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | move the strict validations to an appropriate section and some edits [ci skip]Vijay Dev2012-02-281-14/+12
| * | | | | copy edits [ci skip]Vijay Dev2012-02-281-1/+1
| * | | | | Add brief summary of strict validations added in 3.2.Oliver Legg2012-02-271-0/+14
| * | | | | Correct NullStore cache store name in caching guideToby Matejovsky2012-02-271-1/+1
| * | | | | document how to create non show paths from an array of parametersFlorent Guilleux2012-02-261-0/+6
| * | | | | reverted regular expression fixTima Maslyuchenko2012-02-261-2/+2
| * | | | | Merge branch 'master' of github.com:lifo/docrailsTima Maslyuchenko2012-02-261-1/+1
| |\ \ \ \ \
| | * | | | | layout affects views not methodsRajinder Yadav2012-02-261-1/+1
| * | | | | | fixed regular expression in Specifying Constraints sectionTima Maslyuchenko2012-02-261-2/+2
| |/ / / / /
* | | | | | Merge pull request #4284 from mattdbridges/time_calculation_aliasesXavier Noria2012-02-286-6/+80
|\ \ \ \ \ \
| * | | | | | Adding :last_week, :last_month, and :last_year aliases to Time and DateMatt Bridges2012-02-216-6/+80
* | | | | | | Merge pull request #5199 from gabehollombe/masterXavier Noria2012-02-281-2/+3
|\ \ \ \ \ \ \