aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Make update_ujs task update the right filesSantiago Pastorino2011-04-291-2/+2
* Include CSRF token in remote:true callsDavid Heinemeier Hansson2011-04-291-1/+6
* table name needs to be classified when instantiating fixturesAaron Patterson2011-04-291-2/+4
* Merged pull request #350 from bcardarella/master.Xavier Noria2011-04-291-1/+1
|\
| * Fixed comment 'config.asset' => 'config.assets'Brian Cardarella2011-04-291-1/+1
|/
* JavaScript expansions are ignored if the application uses the asset pipeline,...Xavier Noria2011-04-291-0/+4
* convert query results to a list of listsAaron Patterson2011-04-291-2/+1
* requring pg ~> 0.11, so remove conditional code for supporting older versions...Aaron Patterson2011-04-291-56/+12
* No need for &block here.José Valim2011-04-291-1/+1
* Make postgresql faster on development (thanks to @tapajos).José Valim2011-04-291-0/+8
* lean on rubygems to provide error messages about missing gemsAaron Patterson2011-04-291-9/+2
* supporting delete with bind parameters in mysql2Aaron Patterson2011-04-291-0/+8
* refactor exec_delete to reuse the statement cache from exec_queryAaron Patterson2011-04-291-70/+44
* statement cache for deletes working on mysqlAaron Patterson2011-04-291-0/+39
* sqlite3 supports prepared statement deletesAaron Patterson2011-04-291-0/+5
* postgresql supports prepare statement deletesAaron Patterson2011-04-294-26/+52
* supporting nil when passed in as an IN clauseAaron Patterson2011-04-292-4/+16
* Test that passing nil member of array in conditions retrieves records with nilgmile2011-04-291-0/+22
* Merged pull request #344 from asanghi/callback_if.José Valim2011-04-283-3/+17
|\
| * fix typoAditya Sanghi2011-04-291-1/+1
| * :if should not fire on validations when not in context with :onAditya Sanghi2011-04-293-3/+17
|/
* Merge remote branch 'myron/am_disabling_fix_memory_leaks'José Valim2011-04-283-56/+155
|\
| * Add additional tests for AM::ObserverArray that I had missed yesterday.Myron Marston2011-04-281-1/+50
| * Fix bug with AM::Observer disablement.Myron Marston2011-04-283-25/+27
| * Fix dev env memory leaks by using AS::DescendantsTracker rather than keeping ...Myron Marston2011-04-282-36/+12
| * Revert "Revert "Handle enabling/disabling observers at different levels of th...Myron Marston2011-04-283-3/+75
* | clearing statement from cache on exception in order to support older versions...Aaron Patterson2011-04-281-3/+13
|/
* Merged pull request #327 from dcrec1/master.José Valim2011-04-282-3/+17
|\
| * added a :prefix option to number_to_human_sizeDiego Carrion2011-04-272-3/+17
* | 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
|/ / /