aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5705 from lest/patch-3Jeremy Kemper2012-04-301-1/+5
|\
| * split CDATA end token in cdata_section helperSergey Nartimov2012-04-301-1/+5
* | Merge pull request #6084 from brainopia/support_for_magic_domain_on_all_storesJosé Valim2012-04-301-0/+7
|\ \
| * | Support cookie jar options for all cookie storesbrainopia2012-04-301-0/+7
* | | Merge pull request #6082 from brainopia/smarter_cookie_jarJosé Valim2012-04-301-7/+10
|\ \ \
| * | | Dont stream back cookie value if it was set to the same valuebrainopia2012-04-301-4/+6
| * | | Dont set cookie header for deletion of unexisting databrainopia2012-04-301-1/+2
| * | | Simplify matching with array of possible domainsbrainopia2012-04-301-1/+1
| * | | Use more appropriate one-liner for class declarationbrainopia2012-04-301-1/+1
* | | | Merge pull request #6083 from brainopia/remove_unused_closed_ivarsJosé Valim2012-04-302-2/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove unused ivars left from close checksbrainopia2012-04-302-2/+0
| | |/ | |/|
* | | Merge pull request #3726 from JanDupal/fix-date-helper-hiddenJosé Valim2012-04-301-0/+2
|\ \ \ | |_|/ |/| |
| * | fix Helpers::DateHelper with :use_hidden - hide separatorsJan Dupal2011-11-221-0/+2
* | | Merge pull request #6077 from dmitriy-kiriyenko/improve_signature_of_time_in_...José Valim2012-04-301-27/+33
|\ \ \
| * | | Replace boolean argument with an options hash.Dmitriy Kiriyenko2012-04-301-27/+33
* | | | 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