aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2245 from davidtrogers/constraints_block_passed_to_follow...Santiago Pastorino2011-07-251-6/+5
|\
| * Ensure the constraints block is only applied to the correct routeDave Rogers2011-07-251-6/+5
* | Merge pull request #2258 from thedarkone/no-file-statJosé Valim2011-07-251-1/+1
|\ \
| * | Use shorter class-level File methods instead of going through File.stat.thedarkone2011-07-251-1/+1
| |/
* / Make polymorphic_url calls go through application helpers again.thedarkone2011-07-251-8/+1
|/
* Merge pull request #2243 from dmathieu/commentXavier Noria2011-07-241-0/+1
|\
| * help the next guy with explanations - See bb3b3e306Damien Mathieu2011-07-241-0/+1
* | Use top level Rails constantAndrew White2011-07-241-2/+2
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-246-10/+10
|\ \ | |/ |/|
| * Missed a few instances of British English spelling in the last commitOemuer Oezkir2011-07-243-3/+3
| * Changed a few instances of of words in the API docs written in British Englis...Oemuer Oezkir2011-07-245-9/+9
| * now the documentation reflects the actual returned value for a missing transl...gnagno2011-07-231-1/+1
* | - added ActionView::PartialRenderer#merge_path_into_partial(path, partial)Gaston Ramos2011-07-241-2/+16
* | Merge pull request #2228 from Empact/helper_tags_in_mailersAaron Patterson2011-07-231-0/+2
|\ \
| * | Simple fix to the NoMethodError noted in #2177.Ben Woosley2011-07-231-0/+2
* | | rake assets:precompile should always perform caching - Closes #2199Damien Mathieu2011-07-241-0/+1
|/ /
* / checked all .rb files in the project tree for missing magic comments, one was...Xavier Noria2011-07-231-0/+2
|/
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-233-71/+95
|\
| * little details seen while doing a pass through what's new in docrailsXavier Noria2011-07-232-7/+7
| * use the doc conventions for arguments in all casesRay Baxter2011-07-201-3/+3
| * Update form helper documentation to match code.Paul Battley2011-07-191-2/+2
| * reword select_date's behaviour clearly when an incomplete options array is pa...Vijay Dev2011-07-201-3/+3
| * minor corrections in form helpers guide and api docsVijay Dev2011-07-201-2/+2
| * examples for telephone_field, url_field and email_fieldRay Baxter2011-07-171-0/+12
| * document options to search_fieldRay Baxter2011-07-171-1/+22
| * use correct in descriptionRay Baxter2011-07-171-1/+1
| * we're talking about days here, not hoursRay Baxter2011-07-171-1/+1
| * wording between select_second, select_minute andRay Baxter2011-07-171-2/+2
| * fix typoRay Baxter2011-07-171-1/+1
| * make documentation agree with test expectations andRay Baxter2011-07-171-2/+2
| * document that second tags are also returned by defaultRay Baxter2011-07-161-1/+1
| * there is no Time.today method, use Time.nowRay Baxter2011-07-161-2/+2
| * remove stray characterRay Baxter2011-07-161-1/+1
| * disambiguate uses of post/POST by using "article"Ray Baxter2011-07-161-28/+28
| * clarify that classes that include DateHelper canRay Baxter2011-07-161-2/+2
| * clarify that DateTime objects are allowed arguments Ray Baxter2011-07-161-1/+1
| * use minute instead of second in description of select_minuteRay Baxter2011-07-161-2/+2
| * show correct helper in descriptionRay Baxter2011-07-161-1/+1
| * use 'hour' instead of 'minutes' and 'second' for select_hourRay Baxter2011-07-161-2/+2
| * Documentation fixes for rendering partialsOlek Janiszewski2011-07-091-20/+11
* | use rake tasks to set the default environment variables. fixes #2126Aaron Patterson2011-07-211-10/+10
* | Check Accept and Content-Type headers before evaluating them in xhr requests....ogeidix2011-07-191-1/+2
* | Ensure that status codes are logged properlyJesse Storimer2011-07-181-4/+4
* | Merge pull request #2124 from arunagw/render_partial_invalid_check_fixSantiago Pastorino2011-07-171-2/+1
|\ \
| * | Checking with to_s. As regexp fail with 1.8.7Arun Agrawal2011-07-181-2/+1
* | | Don't do remove_possible_method when delegate is used. Two reasons: 1) warnin...Jon Leighton2011-07-181-1/+2
|/ /
* | Merge pull request #2018 from bhus/render_partial_invalid_checkSantiago Pastorino2011-07-171-0/+6
|\ \
| * | Added view template invalid name check, along with tests. No merges in commit.huskins2011-07-131-0/+6
* | | indeed, if we are going to remove everything in public/assets on assets:clean...Xavier Noria2011-07-171-4/+1
* | | if we are cleaning all files, we are cleaning all gz filesXavier Noria2011-07-171-1/+0