aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5310 from Serabe/layout_for_partials_with_collectionsJosé Valim2012-03-061-1/+46
|\
| * Adds line to change log and update documentation.Sergio Arbeo2012-03-071-0/+37
| * Adds :layout option to render :partial when a collection is given.Sergio Arbeo2012-03-061-1/+9
* | Refactor AD::UploadedFile, and raise sooner if tempfile is not presentCarlos Antonio da Silva2012-03-061-8/+6
* | Remove unused ActionController::SessionManagementSantiago Pastorino2012-03-063-11/+0
* | Avoid ImplicitRender just call render directlySantiago Pastorino2012-03-061-3/+1
* | Clean up module docs [ci skip]Vijay Dev2012-03-072-27/+27
* | Merge pull request #5298 from sikachu/master-fix-responderJosé Valim2012-03-062-12/+13
|\ \
| * | Always passing a respond block from to responderPrem Sichanugrist2012-03-052-12/+13
| |/
* / Compute asset paths from the request if ENV["RAILS_RELATIVE_URL_ROOT"] is not...Dwayne Litzenberger2012-03-051-1/+1
|/
* Merge pull request #5290 from steveklabnik/masterJosé Valim2012-03-051-3/+3
|\
| * Added parsing of arbitrary media type parameters.Steve Klabnik2012-03-051-3/+3
* | force response body to be read in assert_templateSergey Nartimov2012-03-051-0/+4
|/
* Route root helper shortcutBrian Cardarella2012-03-031-0/+5
* Merge pull request #5246 from lest/patch-2José Valim2012-03-031-1/+1
|\
| * simplify namespace assignment in fields_forSergey Nartimov2012-03-021-1/+1
* | remove usages of AS::OrderedHashVishnu Atrai2012-03-031-1/+1
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-031-1/+1
|\ \
| * | Removed max-stale from the setting the cache-headers in the response as max-s...Anuj Dutta2012-03-021-1/+1
* | | Turn off verbose mode of rack-cache, we still have X-Rack-Cache to check that...Santiago Pastorino2012-03-031-1/+1
| |/ |/|
* | Can't cache url_options on a controller levelPiotr Sarnacki2012-03-021-11/+12
* | don't pass unnecessary argumentSergey Nartimov2012-03-021-2/+2
* | Merge pull request #5242 from rails/opt_routesJosé Valim2012-03-026-39/+98
|\ \
| * | Optimize url helpers.Sergey Nartimov + José Valim2012-03-023-20/+27
| * | Optimize path helpers.José Valim2012-03-025-29/+81
* | | Fix #5238, rendered_format is not set when template is not renderedPiotr Sarnacki2012-03-021-0/+2
* | | Allow fieldsets to be created without a block.Ben Pickles2012-03-011-2/+1
|/ /
* | Merge branch 'master-security'Aaron Patterson2012-03-012-4/+3
|\ \
| * | use AS::SafeBuffer#clone_empty for flushing the output_bufferAkira Matsuda2012-02-201-1/+1
| * | fix output safety issue with select optionsSergey Nartimov2012-02-201-3/+3
* | | Tap, tap goes the middlewareJeremy Kemper2012-02-291-4/+1
* | | Merge pull request #5203 from avakhov/anonymous-controller-layoutAaron Patterson2012-02-291-0/+4
|\ \ \
| * | | Fix layout lookup for anonymous controllerAlexey Vakhov2012-02-281-0/+4
| | |/ | |/|
* | | Merge pull request #5219 from mattfawcett/2781-fix-querystring-route-constrai...Aaron Patterson2012-02-292-4/+5
|\ \ \
| * | | Fix the assert_recognizes test method so that it works when there areMatt Fawcett2012-02-242-4/+5
* | | | fix api doc [ci skip]Vijay Dev2012-03-011-1/+1
* | | | adds a nodoc [ci skip]Vijay Dev2012-03-011-1/+1
* | | | reduced localhost check to two method callsAaron Patterson2012-02-281-2/+3
* | | | remove unnecessary memcache equire in ActionDispatch::Session::CacheStoreBrian Durand2012-02-281-1/+0
| |/ / |/| |
* | | Change asset_host config language to be more helpful and accurateGabe Hollombe2012-02-281-2/+3
* | | Add a new line after the textarea opening tag.Rafael Mendonça França2012-02-271-1/+1
* | | Fix collection_check_boxes and collection_radio_buttons when using localRafael Mendonça França2012-02-261-0/+1
* | | Add documentation to object method of CollectionHelpers::BuilderRafael Mendonça França2012-02-261-6/+6
* | | use content_tag instead stringsVasiliy Ermolovich2012-02-251-3/+4
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-02-252-2/+2
|\ \ \
| * | | Fix typo in match :to docsJustin Woodbridge2012-02-231-1/+1
| * | | Fix AbstractController#controller_path docAlexey Vakhov2012-02-191-1/+1
* | | | Merge pull request #5117 from nashby/form-option-refactorJosé Valim2012-02-251-17/+11
|\ \ \ \
| * | | | refactor option_text_and_value and option_value_selected? methodsVasiliy Ermolovich2012-02-211-10/+3
| * | | | refactor time_zone_options_for_selectVasiliy Ermolovich2012-02-211-7/+8