aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6078 from lest/patch-4José Valim2012-04-301-18/+12
|\
| * no need to dup options in send_dataSergey Nartimov2012-04-301-1/+1
| * allow send_file/send_data to skip disposition header, closes #2973Sergey Nartimov2012-04-301-17/+11
* | Merge pull request #6034 from willbryant/flash_must_not_load_session_on_every...Piotr Sarnacki2012-04-302-7/+3
|\ \
| * | fix the Flash middleware loading the session on every request (very dangerous...Will Bryant2012-04-282-7/+3
* | | wrap translate defaults to use translate helper features, closes #1102Sergey Nartimov2012-04-301-0/+16
| |/ |/|
* | Add note about using 303 See Other for XHR requests other than GET/POSTAndrew White2012-04-301-0/+10
* | Remove `button_to_function` and `link_to_function` helpersRafael Mendonça França2012-04-301-35/+0
* | Add missing require when helpers are used in isolationRafael Mendonça França2012-04-301-0/+1
* | Merge pull request #6074 from mark-rushakoff/unused-variablesJeremy Kemper2012-04-291-1/+0
|\ \
| * | Remove unused assignmentsMark Rushakoff2012-04-291-1/+0
* | | Restore interpolation of path option in redirect routesAndrew White2012-04-291-0/+10
* | | Escape interpolated params when redirecting - fixes #5688Andrew White2012-04-291-1/+7
* | | Fix controller_class_name for anonymous controllers.Michael Schuerig2012-04-291-1/+1
* | | Merge pull request #6059 from rafaelfranca/check_box_invertedJosé Valim2012-04-291-4/+2
|\ \ \
| * | | Change check_box to work inverting the checked and unchecked valueRafael Mendonça França2012-04-291-4/+2
| |/ /
* | | Merge pull request #6006 from carlosantoniodasilva/partial-layout-collection-...José Valim2012-04-291-14/+17
|\ \ \
| * | | Add changelog entry and some docs for collection + layoutCarlos Antonio da Silva2012-04-291-3/+7
| * | | Move layout logic with collection to be handled only with explicit template i...Carlos Antonio da Silva2012-04-291-15/+8
| * | | Allow access to current object_counter variable from layout when rendering wi...Carlos Antonio da Silva2012-04-291-1/+2
| * | | Allow layout to access current object being rendered when using render partia...Carlos Antonio da Silva2012-04-291-1/+1
| * | | Allow layout rendering to access current object being rendered when using par...Carlos Antonio da Silva2012-04-291-6/+11
| |/ /
* | | Merge pull request #6017 from larzconwell/remove_sanitize_dom_idJeremy Kemper2012-04-291-6/+1
|\ \ \ | |/ / |/| |
| * | Removed the sanitize_dom_id method because HTML5 doctype let's us use anythin...Larz Conwell2012-04-271-6/+1
* | | Don't convert params if the request isn't HTML - fixes #5341Andrew White2012-04-291-6/+18
* | | Avoid calling content type multiple timesJosé Valim2012-04-291-4/+6
* | | Merge pull request #2321 from omjokine/masterJosé Valim2012-04-291-1/+4
|\ \ \
| * \ \ Merge remote-tracking branch 'upstream/master'Olli Jokinen2011-12-01100-961/+1695
| |\ \ \
| * | | | Change mimetype to Mime::JS if JSONP is usedOlli Jokinen2011-07-281-1/+4
* | | | | Lazy load `default_form_builder` if it's passed as a stringPiotr Sarnacki2012-04-281-1/+7
* | | | | Merge session arg with existing session instead of overwritingAndrew White2012-04-281-1/+1
| |_|_|/ |/| | |
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-282-4/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Use <tt>Foo::Bar</tt> instead of +Foo::Bar+Mark Rushakof2012-04-272-4/+4
* | | | Merge pull request #5989 from arunagw/warning_removed_master_apJon Leighton2012-04-271-3/+3
|\ \ \ \
| * | | | Shadowing variable warning removedArun Agrawal2012-04-261-3/+3
* | | | | refactor content_tag_for helperSergey Nartimov2012-04-261-3/+3
* | | | | use safe_join in number helperSergey Nartimov2012-04-261-1/+1
* | | | | remove unnecessary else statementVasiliy Ermolovich2012-04-261-3/+3
* | | | | fix number_to_human docs [ci skip]Vijay Dev2012-04-261-2/+2
|/ / / /
* / / / Allow loading external route files from the routerJose and Yehuda2012-04-252-0/+18
|/ / /
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-252-1/+4
|\ \ \
| * | | Missed checked in Form Helper exampleAlexey Vakhov2012-04-241-1/+1
| * | | Add distance_of_time_in_words example for secondsAlexey Vakhov2012-04-221-0/+3
* | | | Merge pull request #5980 from gazay/valid_ipsJeremy Kemper2012-04-251-22/+68
|\ \ \ \
| * | | | Valid ips v4 and v6. Right logic for working with X-FORWARDED-FOR header and ...Alexey Gaziev2012-04-251-22/+68
| |/ / /
* | | | Remove unnecessary empty line José Valim2012-04-251-1/+0
* | | | Remove default match without specified methodJose and Yehuda2012-04-241-2/+12
* | | | Merge pull request #5961 from bogdan/routesJeremy Kemper2012-04-241-20/+26
|\ \ \ \
| * | | | ActionDispatch::HTTP::Url#url_for refactor methodBogdan Gusiev2012-04-241-20/+26
* | | | | Merge pull request #5927 from avakhov/distance_of_time_in_words-swapJeremy Kemper2012-04-241-14/+19
|\ \ \ \ \