aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merged pull request #336 from neerajdotname/upgrade_rack_mount.José Valim2011-04-281-1/+1
|\
| * upgrade rack-mountNeeraj Singh2011-04-281-1/+1
|/
* Tidy up previous commit.José Valim2011-04-281-3/+8
* Merged pull request #219 from panthomakos/memcache.José Valim2011-04-282-1/+42
|\
| * Fixed special character encoding issue with MemCacheStore in Ruby 1.9.2.Pan Thomakos2011-03-112-1/+42
* | Merged pull request #333 from jgarber/master.José Valim2011-04-282-2/+13
|\ \
| * | Allow a label with the value option to have value-specific translations.Jason Garber2011-04-272-2/+13
* | | Revert "Handle enabling/disabling observers at different levels of the class ...José Valim2011-04-283-75/+3
* | | Merged pull request #328 from MSNexploder/fix_clear_inflector.José Valim2011-04-282-13/+31
|\ \ \
| * | | proper reset all inflector scopesStefan Huber2011-04-252-13/+31
* | | | Handle enabling/disabling observers at different levels of the class hierarchy.Myron Marston2011-04-283-3/+75
* | | | Allow observers to be enabled and disabled.Myron Marston2011-04-285-3/+276
* | | | Wrap line that is over 200 characters long. Now it's much easier to read.Myron Marston2011-04-281-1/+5
| |/ / |/| |
* | | requiring a newer version of the mysql2 gemAaron Patterson2011-04-272-1/+2
* | | Merged pull request #325 from joshk/mass_assignment_tests_fixed.Aaron Patterson2011-04-271-7/+7
|\ \ \
| * | | some test renaming to avoid collisions, and some annoying issues between dbsJosh Kalderimis2011-04-271-7/+7
|/ / /
* | | prevent errors when passing a frozen string as a param to ActionController::T...misfo2011-04-282-1/+15
* | | Merged pull request #325 from joshk/mass_assignment_tests_fixed.Aaron Patterson2011-04-271-4/+4
|\ \ \
| * | | final corrections to the mass-assignment security testsJosh Kalderimis2011-04-271-4/+4
|/ / /
* | | Merged pull request #324 from joshk/fix_array_from.Joshua Peek2011-04-271-1/+1
|\ \ \
| * | | fixed a small bug with Array#from core_extJosh Kalderimis2011-04-271-1/+1
|/ / /
* | | Relevant options closer togetherDavid Heinemeier Hansson2011-04-271-4/+4
* | | minor git sources formatting change in railties app_base.rbJosh Kalderimis2011-04-271-3/+3
* | | using @tenderlove's suggested implementation to speed things upJared McFarland2011-04-271-1/+1
* | | enable uglifier gem as new version of execjs is relasedGanesh Kumar2011-04-272-2/+2
* | | Merged pull request #319 from nusco/master.Piotr Sarnacki2011-04-261-1/+1
|\ \ \
| * | | Fixed minor typo in commentPaolo "Nusco" Perrotta2011-04-261-1/+1
|/ / /
* | | Merged pull request #318 from joshk/fix_tests.Aaron Patterson2011-04-262-15/+15
|\ \ \
| * | | fix mass-assignment security tests, this was due to a string column limit whi...Josh Kalderimis2011-04-272-15/+15
|/ / /
* | | Merged pull request #317 from jaredonline/master.David Heinemeier Hansson2011-04-262-3/+3
|\ \ \
| * | | fixing Array#from to return consistent resultsJared McFarland2011-04-262-3/+3
|/ / /
* | | Merged pull request #313 from chadk/master.David Heinemeier Hansson2011-04-262-2/+17
|\ \ \
| * | | moving check fo scheme-relative URI into is_uri?Chad Krsek2011-04-261-9/+2
| * | | asset helpers should understand scheme-relative URLsChad Krsek2011-04-262-2/+24
| * | | Revert "asset helpers should understand scheme-relative URLs"Chad Krsek2011-04-252-24/+2
| * | | asset helpers should understand scheme-relative URLsChad Krsek2011-04-252-2/+24
* | | | Prem fixes 1.9 engine test issueDavid Heinemeier Hansson2011-04-261-1/+1
* | | | Merged pull request #279 from miloops/434d757.José Valim2011-04-261-1/+1
|\ \ \ \
| * | | | Fix console to accept [environment] [options] as specified in docs.Emilio Tagua2011-04-141-1/+1
* | | | | Merged pull request #314 from smartinez87/master.Aaron Patterson2011-04-261-1/+1
|\ \ \ \ \
| * | | | | Fix #update_attributes api format errorSebastian Martinez2011-04-261-1/+1
|/ / / / /
* | | | | simplifying buffered logger for easier and slightly more performant codes. pu...Aaron Patterson2011-04-262-10/+5
* | | | | Merged pull request #307 from arunagw/master.Aaron Patterson2011-04-264-3/+58
|\ \ \ \ \
| * | | | | Database creation for jdbcpostgresql #jrubyArun Agrawal2011-04-261-1/+1
| * | | | | jdbcpostgresql support added into template.Vishnu Atrai2011-04-263-2/+57
* | | | | | Merged pull request #311 from joshk/assign_attributes.David Heinemeier Hansson2011-04-260-0/+0
|\ \ \ \ \ \
* | | | | | | Merged pull request #311 from joshk/assign_attributes.Aaron Patterson2011-04-262-4/+49
|\| | | | | |
| * | | | | | AR update_attributes api is updated to reflect the addition of assign_attributesJosh Kalderimis2011-04-262-4/+49
* | | | | | | Merged pull request #312 from joshk/bump_multi_json.Joshua Peek2011-04-261-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | bump multi_json dependencyJosh Kalderimis2011-04-261-1/+1