aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* update contributors guide to reflect GitHub useDan Pickett2011-04-291-37/+30
| | | | | * outlines how to review pull requests * outlines how to issue pull requests * changed all references from LH => GH
* Merged pull request #350 from bcardarella/master.Xavier Noria2011-04-291-1/+1
|\ | | | | Fixed documentation, 'asset' -> 'assets'
| * Fixed comment 'config.asset' => 'config.assets'Brian Cardarella2011-04-291-1/+1
|/
* JavaScript expansions are ignored if the application uses the asset ↵Xavier Noria2011-04-291-0/+4
| | | | pipeline, warn the user
* convert query results to a list of listsAaron Patterson2011-04-291-2/+1
|
* requring pg ~> 0.11, so remove conditional code for supporting older ↵Aaron Patterson2011-04-291-56/+12
| | | | versions of the gem
* 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
| | | | value on a selected field.
* Merged pull request #344 from asanghi/callback_if.José Valim2011-04-283-3/+17
|\ | | | | :if should not fire on validations when not in context with :on
| * 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
| | | | | | | | | | Now that we propagate the enabling/disabling to descendants, we no longer have to check the disabled_observer Set on each superclass of the model class. This was causing a bug when disabling all observers at a superclass level and then enabling an individual observer at a subclass level. Plus the logic is simpler now :).
| * Fix dev env memory leaks by using AS::DescendantsTracker rather than keeping ↵Myron Marston2011-04-282-36/+12
| | | | | | | | | | track of subclasses manually. There's also no need to keep track of all ObserverArray instances in a hash, as this is likely to leak memory, too.
| * Revert "Revert "Handle enabling/disabling observers at different levels of ↵Myron Marston2011-04-283-3/+75
| | | | | | | | | | | | | | | | | | the class hierarchy."" This reverts commit 2a25c5818b03d7d6cd63aad180bff23479dbd861. I'm going to add another commit that keeps the same behavior of fixes the problems of leaking memory in development.
* | clearing statement from cache on exception in order to support older ↵Aaron Patterson2011-04-281-3/+13
|/ | | | versions of mysql
* Merged pull request #327 from dcrec1/master.José Valim2011-04-282-3/+17
|\ | | | | Prefix option for number_to_human_size
| * 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-mount to 0.7.2
| * | upgrade rack-mountNeeraj Singh2011-04-281-1/+1
|/ / | | | | | | Newer version is a few minor performance fixes
* | Tidy up previous commit.José Valim2011-04-281-3/+8
| |
* | Merged pull request #219 from panthomakos/memcache.José Valim2011-04-282-1/+42
|\ \ | | | | | | Character encoding issues with MemCacheStore in 1.9.2
| * | 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
|\ \ \ | | | | | | | | Specific translations for labels with values
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hierarchy." This reverts commit ad62f1928768bd2676958a4a08512bad342fe469 because the current subclasses implementation leaks memory in development. Instead of keeping an array of subclasses, the better solution is to ask the parent if an observer is being disabled or not.
* | | | Merged pull request #328 from MSNexploder/fix_clear_inflector.José Valim2011-04-282-13/+31
|\ \ \ \ | | | | | | | | | | proper reset all inflector scopes
| * | | | 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
| | | | | | | | | | | | | | | | | | | | Last call wins.
* | | | | Allow observers to be enabled and disabled.Myron Marston2011-04-285-3/+276
| | | | | | | | | | | | | | | | | | | | This is useful in situations like model unit tests and the occasional rake task to backfill old data.
* | | | | 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
|\ \ \ | | | | | | | | final corrections to the mass-assignment security tests
| * | | 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 ↵misfo2011-04-282-1/+15
| | | | | | | | | | | | | | | | | | | | | ActionController::TestCase#process since ActionDispatch::Http::Parameters#encode_params will force encoding on all params strings (when using an encoding aware Ruby), dup all strings passed into process. This prevents modification of params passed in and, more importantly, doesn't barf when a frozen string is passed thanks and high fives to kinsteronline
* | | Merged pull request #325 from joshk/mass_assignment_tests_fixed.Aaron Patterson2011-04-271-4/+4
|\ \ \ | | | | | | | | final corrections to the mass-assignment security tests
| * | | 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_ext
| * | | 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
| | |