aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* 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-252-42/+182
|\ \
| * | Valid ips v4 and v6. Right logic for working with X-FORWARDED-FOR header and ...Alexey Gaziev2012-04-252-42/+182
| |/
* | Remove unnecessary empty line José Valim2012-04-251-1/+0
* | Remove default match without specified methodJose and Yehuda2012-04-2440-343/+353
* | 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-242-16/+41
|\ \ \
| * | | Use leap years trick in distance_of_time_in_words only for distances between ...Alexey Vakhov2012-04-242-12/+18
| * | | fixed non matching documentation behaviour with method semantics on distance_...Marcelo Casiraghi2012-04-242-3/+20
| * | | Distance of time in words should work correct if from time > to_timeAlexey Vakhov2012-04-242-2/+4
* | | | 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-202-35/+22
|\ \
| * | converting some tests to assert_raises, and DRY'ing retrieve_variable changesTieg Zaharia2012-04-162-40/+18
| * | catch nil.to_sym errors in partial_renderer, and raise ArgumentError insteadTieg Zaharia2012-04-162-1/+10
* | | 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
* | | Remove unused test code.Rafael Mendonça França2012-04-161-5/+0
| |/ |/|
* | Update Rails 3.2.3 release date in changelogs as March 30, 2012Michael de Silva2012-04-161-1/+1
* | Merge pull request #5814 from lest/patch-4Piotr Sarnacki2012-04-131-12/+13
|\ \
| * | don't duplicate default values in text helperSergey Nartimov2012-04-111-12/+13
* | | Remove obsolete codeAlexey Vakhov2012-04-121-3/+0
* | | #send_file leans on Rack::Sendfile to X-Accel-Redirect the file's path, so op...Jeremy Kemper2012-04-121-1/+21
| |/ |/|
* | avoid autolinking by rdoc [ci skip]Vijay Dev2012-04-121-2/+2
* | Merge pull request #5746 from jmbejar/index_method_form_builderSantiago Pastorino2012-04-113-5/+74
|\ \ | |/ |/|
| * Add index method to FormBuilder. Useful when you use field_for and need to kn...Jorge Bejar2012-04-113-5/+74
* | no need in temporary array in number_to_phone helperSergey Nartimov2012-04-091-2/+2
* | Adding itemscope to list of boolean attributes.Frankie Roberto2012-04-092-3/+3
* | Merge pull request #5783 from rafaelfranca/default_url_optionsSantiago Pastorino2012-04-082-2/+2
|\ \
| * | default_url_options does not receive one argument anymoreRafael Mendonça França2012-04-082-2/+2
* | | Revert "Merge pull request #5750 from ahoward/master"Santiago Pastorino2012-04-082-28/+1
|/ /
* | Merge pull request #5748 from ai/no_type_in_html5Jeremy Kemper2012-04-0813-168/+168
|\ \
| * | Remove unnecessary in HTML 5 type attribute with default valueAndrey A.I. Sitnik2012-04-0513-168/+168
* | | Merge pull request #5772 from lest/patch-4Xavier Noria2012-04-071-6/+4
|\ \ \
| * | | use extract_options! in cycle helperSergey Nartimov2012-04-071-6/+4