Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | Support cookie jar options for all cookie stores | brainopia | 2012-04-30 | 2 | -0/+14 | |
* | | | | | | | | Merge pull request #6082 from brainopia/smarter_cookie_jar | José Valim | 2012-04-30 | 2 | -15/+46 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Dont stream back cookie value if it was set to the same value | brainopia | 2012-04-30 | 2 | -4/+18 | |
| * | | | | | | | | Dont set cookie header for deletion of unexisting data | brainopia | 2012-04-30 | 2 | -9/+26 | |
| * | | | | | | | | Simplify matching with array of possible domains | brainopia | 2012-04-30 | 1 | -1/+1 | |
| * | | | | | | | | Use more appropriate one-liner for class declaration | brainopia | 2012-04-30 | 1 | -1/+1 | |
* | | | | | | | | | Merge pull request #6083 from brainopia/remove_unused_closed_ivars | José Valim | 2012-04-30 | 2 | -2/+0 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Remove unused ivars left from close checks | brainopia | 2012-04-30 | 2 | -2/+0 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #3726 from JanDupal/fix-date-helper-hidden | José Valim | 2012-04-30 | 2 | -0/+34 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | fix Helpers::DateHelper with :use_hidden - hide separators | Jan Dupal | 2011-11-22 | 2 | -0/+34 | |
* | | | | | | | | Merge pull request #6077 from dmitriy-kiriyenko/improve_signature_of_time_in_... | José Valim | 2012-04-30 | 4 | -64/+97 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Replace boolean argument with an options hash. | Dmitriy Kiriyenko | 2012-04-30 | 4 | -64/+97 | |
* | | | | | | | | | Merge pull request #6078 from lest/patch-4 | José Valim | 2012-04-30 | 2 | -18/+23 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | no need to dup options in send_data | Sergey Nartimov | 2012-04-30 | 1 | -1/+1 | |
| * | | | | | | | | | allow send_file/send_data to skip disposition header, closes #2973 | Sergey Nartimov | 2012-04-30 | 2 | -17/+22 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #6034 from willbryant/flash_must_not_load_session_on_every... | Piotr Sarnacki | 2012-04-30 | 2 | -7/+3 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | fix the Flash middleware loading the session on every request (very dangerous... | Will Bryant | 2012-04-28 | 2 | -7/+3 | |
| | |_|_|/ / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | wrap translate defaults to use translate helper features, closes #1102 | Sergey Nartimov | 2012-04-30 | 3 | -1/+41 | |
| |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Add note about using 303 See Other for XHR requests other than GET/POST | Andrew White | 2012-04-30 | 1 | -0/+10 | |
* | | | | | | | | Remove `button_to_function` and `link_to_function` helpers | Rafael Mendonça França | 2012-04-30 | 3 | -65/+2 | |
* | | | | | | | | Add missing require when helpers are used in isolation | Rafael Mendonça França | 2012-04-30 | 1 | -0/+1 | |
* | | | | | | | | Merge pull request #6074 from mark-rushakoff/unused-variables | Jeremy Kemper | 2012-04-29 | 2 | -2/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Remove unused assignments | Mark Rushakoff | 2012-04-29 | 1 | -1/+0 | |
| * | | | | | | | | Remove unused assignment in actionpack date helper test | Mark Rushakoff | 2012-04-29 | 1 | -1/+1 | |
* | | | | | | | | | Restore interpolation of path option in redirect routes | Andrew White | 2012-04-29 | 2 | -1/+42 | |
* | | | | | | | | | Escape interpolated params when redirecting - fixes #5688 | Andrew White | 2012-04-29 | 2 | -1/+36 | |
* | | | | | | | | | Add failing test case for #6053 | Andrew White | 2012-04-29 | 1 | -0/+21 | |
* | | | | | | | | | Fix controller_class_name for anonymous controllers. | Michael Schuerig | 2012-04-29 | 1 | -1/+1 | |
* | | | | | | | | | Merge pull request #6059 from rafaelfranca/check_box_inverted | José Valim | 2012-04-29 | 2 | -6/+100 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Change check_box to work inverting the checked and unchecked value | Rafael Mendonça França | 2012-04-29 | 2 | -6/+100 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #6006 from carlosantoniodasilva/partial-layout-collection-... | José Valim | 2012-04-29 | 5 | -16/+39 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Add changelog entry and some docs for collection + layout | Carlos Antonio da Silva | 2012-04-29 | 2 | -3/+10 | |
| * | | | | | | | | | Move layout logic with collection to be handled only with explicit template i... | Carlos Antonio da Silva | 2012-04-29 | 1 | -15/+8 | |
| * | | | | | | | | | Allow access to current object_counter variable from layout when rendering wi... | Carlos Antonio da Silva | 2012-04-29 | 3 | -5/+14 | |
| * | | | | | | | | | Allow layout to access current object being rendered when using render partia... | Carlos Antonio da Silva | 2012-04-29 | 2 | -1/+5 | |
| * | | | | | | | | | Allow layout rendering to access current object being rendered when using par... | Carlos Antonio da Silva | 2012-04-29 | 3 | -8/+18 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #6017 from larzconwell/remove_sanitize_dom_id | Jeremy Kemper | 2012-04-29 | 1 | -6/+1 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Removed the sanitize_dom_id method because HTML5 doctype let's us use anythin... | Larz Conwell | 2012-04-27 | 1 | -6/+1 | |
* | | | | | | | | | Add changelog entry for jsonp mimetype change, fix failing test | Carlos Antonio da Silva | 2012-04-29 | 2 | -1/+3 | |
| |_|_|/ / / / / |/| | | | | | | | ||||||
* | | | | | | | | Don't convert params if the request isn't HTML - fixes #5341 | Andrew White | 2012-04-29 | 2 | -8/+58 | |
* | | | | | | | | Avoid calling content type multiple times | José Valim | 2012-04-29 | 1 | -4/+6 | |
* | | | | | | | | Merge pull request #2321 from omjokine/master | José Valim | 2012-04-29 | 2 | -2/+5 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Olli Jokinen | 2011-12-01 | 180 | -6991/+9152 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | fixed test case test_render_json_with_callback to use content_type applicatio... | Olli Jokinen | 2011-07-28 | 1 | -1/+1 | |
| * | | | | | | | | | Change mimetype to Mime::JS if JSONP is used | Olli Jokinen | 2011-07-28 | 1 | -1/+4 | |
* | | | | | | | | | | Lazy load `default_form_builder` if it's passed as a string | Piotr Sarnacki | 2012-04-28 | 3 | -1/+26 | |
* | | | | | | | | | | Merge session arg with existing session instead of overwriting | Andrew White | 2012-04-28 | 3 | -1/+28 | |
| |_|_|/ / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-04-28 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Use <tt>Foo::Bar</tt> instead of +Foo::Bar+ | Mark Rushakof | 2012-04-27 | 2 | -4/+4 | |
* | | | | | | | | | Merge pull request #5989 from arunagw/warning_removed_master_ap | Jon Leighton | 2012-04-27 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ |