aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Failing test for #6034Piotr Sarnacki2012-04-301-0/+20
* Merge pull request #6034 from willbryant/flash_must_not_load_session_on_every...Piotr Sarnacki2012-04-302-7/+3
|\
| * fix the Flash middleware loading the session on every request (very dangerous...Will Bryant2012-04-282-7/+3
* | Merge pull request #6072 from marcandre/observer_simplify_testSantiago Pastorino2012-04-301-11/+4
|\ \
| * | Observer: simplify testsMarc-Andre Lafortune2012-04-291-11/+4
* | | Merge pull request #5177 from cap10morgan/fix-gh-issue-4374José Valim2012-04-302-5/+7
|\ \ \
| * | | fix inflector bug where -ice gets pluralized into -ouseWes Morgan2012-02-252-5/+7
* | | | Merge pull request #6076 from arunagw/build_fix_observed_classesJosé Valim2012-04-301-1/+1
|\ \ \ \
| * | | | Build fix for observed_classesArun Agrawal2012-04-301-1/+1
* | | | | Merge pull request #6032 from lest/patch-2José Valim2012-04-303-1/+41
|\ \ \ \ \
| * | | | | wrap translate defaults to use translate helper features, closes #1102Sergey Nartimov2012-04-303-1/+41
|/ / / / /
* / / / / Add note about using 303 See Other for XHR requests other than GET/POSTAndrew White2012-04-301-0/+10
|/ / / /
* | | | Merge pull request #5923 from rafaelfranca/remove_javascript_helpersJeremy Kemper2012-04-294-65/+3
|\ \ \ \
| * | | | Remove `button_to_function` and `link_to_function` helpersRafael Mendonça França2012-04-303-65/+2
| * | | | Add missing require when helpers are used in isolationRafael Mendonça França2012-04-301-0/+1
|/ / / /
* | | | Merge pull request #6074 from mark-rushakoff/unused-variablesJeremy Kemper2012-04-299-15/+7
|\ \ \ \
| * | | | Remove unused assignmentsMark Rushakoff2012-04-294-8/+4
| * | | | Remove unused assignment in actionpack date helper testMark Rushakoff2012-04-291-1/+1
| * | | | Remove unused assignments from activerecord testsMark Rushakoff2012-04-294-6/+2
* | | | | Merge pull request #6075 from arunagw/warning_removed_unused_variableJeremy Kemper2012-04-291-1/+0
|\ \ \ \ \
| * | | | | railties variable is not required here.Arun Agrawal2012-04-301-1/+0
* | | | | | Merge pull request #6071 from marcandre/observer_redefJeremy Kemper2012-04-292-3/+14
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix Observer by acting on singleton class [#3505]Marc-Andre Lafortune2012-04-292-3/+14
| | |_|/ / | |/| | |
* | | | | Merge pull request #5942 from bcardarella/confirmation_error_message_on_confi...Aaron Patterson2012-04-297-11/+38
|\ \ \ \ \
| * | | | | Support i18n attributes for confirmationBrian Cardarella2012-04-243-3/+23
| * | | | | Reordered changelog entryBrian Cardarella2012-04-231-2/+2
| * | | | | Updated CHANGELOGBrian Cardarella2012-04-231-0/+2
| * | | | | confirmation validation error attributeBrian Cardarella2012-04-236-11/+16
* | | | | | Merge pull request #6067 from Locke23rus/patch-2Aaron Patterson2012-04-291-1/+1
|\ \ \ \ \ \
| * | | | | | Fix typoKirill Nikitin2012-04-301-1/+1
* | | | | | | Merge pull request #5999 from bogdan/callbacksJeremy Kemper2012-04-291-7/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | AS::Callbacks optimized to reduce call backtraceBogdan Gusiev2012-04-271-7/+7
* | | | | | | Merge pull request #6036 from carlosantoniodasilva/routes-reloader-refactorSantiago Pastorino2012-04-294-8/+4
|\ \ \ \ \ \ \
| * | | | | | | Refactor RoutesReloader a bit to avoid creating extra hash objectsCarlos Antonio da Silva2012-04-281-3/+2
| * | | | | | | Remove Declarative module extending, it is already part of AS::TestCaseCarlos Antonio da Silva2012-04-281-2/+0
| * | | | | | | Define only writer method for queue, as reader is declaredCarlos Antonio da Silva2012-04-282-3/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Restore interpolation of path option in redirect routesAndrew White2012-04-292-1/+42
* | | | | | | Merge pull request #6062 from marcandre/tweak_observerAaron Patterson2012-04-292-5/+21
|\ \ \ \ \ \ \
| * | | | | | | Generate appropriate error more judiciouslyMarc-Andre Lafortune2012-04-292-2/+18
| * | | | | | | Fix error message:Marc-Andre Lafortune2012-04-281-3/+3
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #6065 from Locke23rus/patch-1Xavier Noria2012-04-291-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Remove repeated wordKirill Nikitin2012-04-301-1/+1
|/ / / / / / /
* | | | | | | Escape interpolated params when redirecting - fixes #5688Andrew White2012-04-292-1/+36
* | | | | | | Merge pull request #6061 from twinturbo/scaffold-markupPiotr Sarnacki2012-04-291-16/+20
|\ \ \ \ \ \ \
| * | | | | | | Close #3886 - Add THEAD and TBODY to scaffold markuptwinturbo2012-04-291-16/+20
|/ / / / / / /
* | | | | | | Add failing test case for #6053Andrew White2012-04-291-0/+21
* | | | | | | Fix controller_class_name for anonymous controllers.Michael Schuerig2012-04-291-1/+1
* | | | | | | Merge pull request #6059 from rafaelfranca/check_box_invertedJosé Valim2012-04-292-6/+100
|\ \ \ \ \ \ \
| * | | | | | | Change check_box to work inverting the checked and unchecked valueRafael Mendonça França2012-04-292-6/+100
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #6006 from carlosantoniodasilva/partial-layout-collection-...José Valim2012-04-296-16/+49
|\ \ \ \ \ \ \