aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
* Allow layout rendering to access current object being rendered when using par...Carlos Antonio da Silva2012-04-291-6/+11
* 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
|\ \ \ \ \
| * | | | | Use leap years trick in distance_of_time_in_words only for distances between ...Alexey Vakhov2012-04-241-12/+16
| * | | | | fixed non matching documentation behaviour with method semantics on distance_...Marcelo Casiraghi2012-04-241-1/+1
| * | | | | Distance of time in words should work correct if from time > to_timeAlexey Vakhov2012-04-241-2/+3
* | | | | | Refactor hash creation in routesetCarlos Antonio da Silva2012-04-241-3/+4
| |/ / / / |/| | | |
* | | | | RouteSet: decomplecting a way to handle positional argsBogdan Gusiev2012-04-241-26/+20
|/ / / /
* | | | RouteSet: simplify routes helpers generation codeBogdan Gusiev2012-04-241-13/+21
* | | | Add missing requires in routesBogdan Gusiev2012-04-232-0/+3
|/ / /
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-213-4/+4
|\ \ \
| * | | Comma missedAlexey Vakhov2012-04-211-1/+1
| * | | Fix example in ActionView::Helpers::FormHelperThibaut Courouble2012-04-201-1/+1
| * | | Fix formattingOscar Del Ben2012-04-181-2/+2
* | | | Merge pull request #5865 from tiegz/minor_fixesAaron Patterson2012-04-201-1/+1
|\ \ \ \
| * | | | converting some tests to assert_raises, and DRY'ing retrieve_variable changesTieg Zaharia2012-04-161-1/+1
| * | | | catch nil.to_sym errors in partial_renderer, and raise ArgumentError insteadTieg Zaharia2012-04-161-1/+1
* | | | | Freeze the middleware stack after it's builtJeremy Kemper2012-04-201-1/+1
| |/ / / |/| | |
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-184-6/+9
|\ \ \ \ | |/ / / |/| | |
| * | | let's keep the slash in the return value instead of the path variable [ci skip]Vijay Dev2012-04-181-2/+2
| * | | Warn about do end syntax in redirect optionOscar Del Ben2012-04-171-0/+3
| * | | Fix redirect with block exampleAlexey Vakhov2012-04-171-3/+3
| * | | Fix example in flash middlewareAlexey Vakhov2012-04-171-1/+1
| * | | Fix comment in AD http responseAlexey Vakhov2012-04-131-1/+1
| * | | Fix HTML sanitizer allowed_css_properties commentAlexey Vakhov2012-04-131-1/+1
* | | | Merge pull request #5814 from lest/patch-4Piotr Sarnacki2012-04-131-12/+13
|\ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 11:50:18 +0000