aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | 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-302-0/+34
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | fix Helpers::DateHelper with :use_hidden - hide separatorsJan Dupal2011-11-222-0/+34
* | | | | | Merge pull request #6077 from dmitriy-kiriyenko/improve_signature_of_time_in_...José Valim2012-04-304-64/+97
|\ \ \ \ \ \
| * | | | | | Replace boolean argument with an options hash.Dmitriy Kiriyenko2012-04-304-64/+97
* | | | | | | Merge pull request #6078 from lest/patch-4José Valim2012-04-302-18/+23
|\ \ \ \ \ \ \
| * | | | | | | 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-302-17/+22
| |/ / / / / /
* | | | | | | 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-303-1/+41
| |/ / / / / |/| | | | |
* | | | | | 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-303-65/+2
* | | | | | 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-292-2/+1
|\ \ \ \ \ \
| * | | | | | Remove unused assignmentsMark Rushakoff2012-04-291-1/+0
| * | | | | | Remove unused assignment in actionpack date helper testMark Rushakoff2012-04-291-1/+1
* | | | | | | Restore interpolation of path option in redirect routesAndrew White2012-04-292-1/+42
* | | | | | | Escape interpolated params when redirecting - fixes #5688Andrew White2012-04-292-1/+36
* | | | | | | Add failing test case for #6053Andrew White2012-04-291-0/+21
* | | | | | | Fix controller_class_name for anonymous controllers.Michael Schuerig2012-04-291-1/+1
* | | | | | | Merge pull request #6059 from rafaelfranca/check_box_invertedJosé Valim2012-04-292-6/+100
|\ \ \ \ \ \ \
| * | | | | | | Change check_box to work inverting the checked and unchecked valueRafael Mendonça França2012-04-292-6/+100
| |/ / / / / /
* | | | | | | Merge pull request #6006 from carlosantoniodasilva/partial-layout-collection-...José Valim2012-04-295-16/+39
|\ \ \ \ \ \ \
| * | | | | | | Add changelog entry and some docs for collection + layoutCarlos Antonio da Silva2012-04-292-3/+10
| * | | | | | | 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-293-5/+14
| * | | | | | | Allow layout to access current object being rendered when using render partia...Carlos Antonio da Silva2012-04-292-1/+5
| * | | | | | | Allow layout rendering to access current object being rendered when using par...Carlos Antonio da Silva2012-04-293-8/+18
| |/ / / / / /
* | | | | | | 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
* | | | | | | Add changelog entry for jsonp mimetype change, fix failing testCarlos Antonio da Silva2012-04-292-1/+3
| |_|_|/ / / |/| | | | |
* | | | | | Don't convert params if the request isn't HTML - fixes #5341Andrew White2012-04-292-8/+58
* | | | | | Avoid calling content type multiple timesJosé Valim2012-04-291-4/+6
* | | | | | Merge pull request #2321 from omjokine/masterJosé Valim2012-04-292-2/+5
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Olli Jokinen2011-12-01180-6991/+9152
| |\ \ \ \ \ \
| * | | | | | | fixed test case test_render_json_with_callback to use content_type applicatio...Olli Jokinen2011-07-281-1/+1
| * | | | | | | 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-283-1/+26
* | | | | | | | Merge session arg with existing session instead of overwritingAndrew White2012-04-283-1/+28
| |_|_|/ / / / |/| | | | | |
* | | | | | | 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
* | | | | | | | remove calls to deprecated find(:first) in actionpack test suiteSergey Nartimov2012-04-261-2/+2
* | | | | | | | refactor content_tag_for helperSergey Nartimov2012-04-261-3/+3
* | | | | | | | use safe_join in number helperSergey Nartimov2012-04-261-1/+1