aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8716 from miguelff/3-2-stableRafael Mendonça França2013-01-031-1/+1
|\
| * Merge tag 'v3.2.10' into 3-2-stableMiguel2013-01-031-1/+1
| |\
| | * bumping version to 3.2.10Aaron Patterson2012-12-231-1/+1
* | | Merge pull request #8719 from pcasaretto/fix-actionview-doc-typoCarlos Antonio da Silva2013-01-031-1/+1
|/ /
* | Use Ruby 1.8 syntaxRafael Mendonça França2013-01-021-2/+2
* | Backport #8701, do not append a second slash with `trailing_slash: true`Yves Senn2013-01-023-6/+33
* | Add release date of 3.2.10Rafael Mendonça França2013-01-021-1/+5
* | Improve CHANGELOG message [ci skip]Rafael Mendonça França2013-01-021-3/+2
* | Merge branch '3-2-stable' into 3-2-secmergeAaron Patterson2013-01-023-1/+16
|\ \
| * | fix block.arity raise nil error when not given a block to "content_tag_for"jasl2013-01-023-1/+16
* | | Merge branch '3-2-sec' into 3-2-secmergeAaron Patterson2012-12-231-1/+3
|\ \ \ | |/ / |/| / | |/
| * updating the changelogsAaron Patterson2012-12-231-0/+2
| * Add release date of Rails 3.2.9 to documentationclaudiob2012-12-231-1/+1
* | Don't use 1.9 hash syntax on 3-2-stableAndrew White2012-12-141-8/+8
* | Clear url helper methods when routes are reloadedAndrew White2012-12-143-6/+104
* | Merge pull request #8490 from mattv/fix_request_raw_postRafael Mendonça França2012-12-113-2/+15
* | Make distance_of_time_in_words work with DateTime offsetsAndrew White2012-12-042-2/+13
* | Make output of distance_of_time_in_words consistentAndrew White2012-12-042-4/+21
* | Use 1.8 hash styleCarlos Antonio da Silva2012-12-031-1/+1
* | Override <%== to always behave as literal text rather than toggling based on ...Jeremy Kemper2012-12-033-4/+21
* | Merge pull request #8402 from senny/8376_descriptive_error_message_for_partia...Rafael Mendonça França2012-12-023-2/+17
* | Accept symbols as #send_data :disposition valueElia Schito2012-11-273-2/+16
* | @steveklabnik can't spell 'distance.'Steve Klabnik2012-11-261-1/+1
* | Add i18n scope to disance_of_time_in_words.Steve Klabnik2012-11-263-7/+21
* | Add changelog entry for #6003 backportCarlos Antonio da Silva2012-11-161-0/+15
* | Refactor Generator class to not rely on in-place editing the controllerAndrew White2012-11-162-11/+16
* | Fix bug when url_for changes controller.Nikita Beloglazov2012-11-162-2/+11
* | Merge pull request #8235 from tilsammans/dont_escape_actionmailer_when_plaintextJosé Valim2012-11-163-1/+27
* | [ci skip] Correct examples for form_tag helper.DawidJanczak2012-11-141-2/+2
* | Update mocha version to 0.13.0 and change requiresCarlos Antonio da Silva2012-11-132-3/+3
* | Add release date of Rails 3.2.9 to documentationclaudiob2012-11-121-1/+1
* | Merge branch '3-2-9' into 3-2-stableSantiago Pastorino2012-11-121-1/+1
|\|
| * Bump to 3.2.9Santiago Pastorino2012-11-121-1/+1
* | Merge branch '3-2-9' into 3-2-stableSantiago Pastorino2012-11-091-1/+1
|\|
| * Bump up to 3.2.9.rc3Santiago Pastorino2012-11-091-1/+1
| * Merge pull request #8161 from guilleiguaran/downgrade-sprocketsRafael Mendonça França2012-11-091-1/+1
* | Merge pull request #8161 from guilleiguaran/downgrade-sprocketsRafael Mendonça França2012-11-091-1/+1
|\ \
| * | Lock sprockets to 2.2.xGuillermo Iguaran2012-11-091-1/+1
| |/
* | Fix redirect example blockCarlos Antonio da Silva2012-11-091-3/+3
* | Merge pull request #8093 from nikitug/keep_app_x_ua_compatibleCarlos Antonio da Silva2012-11-083-1/+46
* | backport, handle trailing slash with enginesYves Senn2012-11-083-1/+11
* | Merge pull request #8108 from Casecommons/fix-multiple-and-index-in-instance-tagRafael Mendonça França2012-11-083-1/+34
|/
* Clear url helpers when reloading routesSantiago Pastorino2012-11-022-0/+5
* Add test to avoid regression of 4a86362Rafael Mendonça França2012-11-021-0/+10
* Revert "Merge pull request #7668 from Draiken/fix_issue_6497"Rafael Mendonça França2012-11-023-18/+7
* Bump to 3.2.9.rc2Santiago Pastorino2012-11-011-1/+1
* Revert "Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased"Rafael Mendonça França2012-10-314-37/+14
* Revert "Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_va...Rafael Mendonça França2012-10-303-23/+31
* Bump to 3.2.9.rc1Santiago Pastorino2012-10-291-2/+2
* Merge pull request #7865 from teleological/link_to_remote_3_2Rafael Mendonça França2012-10-063-1/+12
|\