Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Prototype and Scriptaculous are no longer vendored, but provided by ↵ | Xavier Noria | 2011-04-30 | 18 | -9598/+27 |
| | | | | prototype-rails from now on, also the -j option of the application generator is removed | ||||
* | making sure the `create_fixtures` method works to prevent regressions | Aaron Patterson | 2011-04-29 | 1 | -0/+5 |
| | |||||
* | make sure we flatten the fixture path list | Aaron Patterson | 2011-04-29 | 1 | -1/+1 |
| | |||||
* | shorten up our fixture path resolving code | Aaron Patterson | 2011-04-29 | 1 | -2/+2 |
| | |||||
* | Update jquery-ujs and prototype-ujs | Santiago Pastorino | 2011-04-29 | 2 | -160/+290 |
| | |||||
* | Make update_ujs task update the right files | Santiago Pastorino | 2011-04-29 | 1 | -2/+2 |
| | |||||
* | Include CSRF token in remote:true calls | David Heinemeier Hansson | 2011-04-29 | 1 | -1/+6 |
| | |||||
* | table name needs to be classified when instantiating fixtures | Aaron Patterson | 2011-04-29 | 1 | -2/+4 |
| | |||||
* | Merged pull request #350 from bcardarella/master. | Xavier Noria | 2011-04-29 | 1 | -1/+1 |
|\ | | | | | Fixed documentation, 'asset' -> 'assets' | ||||
| * | Fixed comment 'config.asset' => 'config.assets' | Brian Cardarella | 2011-04-29 | 1 | -1/+1 |
|/ | |||||
* | JavaScript expansions are ignored if the application uses the asset ↵ | Xavier Noria | 2011-04-29 | 1 | -0/+4 |
| | | | | pipeline, warn the user | ||||
* | convert query results to a list of lists | Aaron Patterson | 2011-04-29 | 1 | -2/+1 |
| | |||||
* | requring pg ~> 0.11, so remove conditional code for supporting older ↵ | Aaron Patterson | 2011-04-29 | 1 | -56/+12 |
| | | | | versions of the gem | ||||
* | No need for &block here. | José Valim | 2011-04-29 | 1 | -1/+1 |
| | |||||
* | Make postgresql faster on development (thanks to @tapajos). | José Valim | 2011-04-29 | 1 | -0/+8 |
| | |||||
* | lean on rubygems to provide error messages about missing gems | Aaron Patterson | 2011-04-29 | 1 | -9/+2 |
| | |||||
* | supporting delete with bind parameters in mysql2 | Aaron Patterson | 2011-04-29 | 1 | -0/+8 |
| | |||||
* | refactor exec_delete to reuse the statement cache from exec_query | Aaron Patterson | 2011-04-29 | 1 | -70/+44 |
| | |||||
* | statement cache for deletes working on mysql | Aaron Patterson | 2011-04-29 | 1 | -0/+39 |
| | |||||
* | sqlite3 supports prepared statement deletes | Aaron Patterson | 2011-04-29 | 1 | -0/+5 |
| | |||||
* | postgresql supports prepare statement deletes | Aaron Patterson | 2011-04-29 | 4 | -26/+52 |
| | |||||
* | supporting nil when passed in as an IN clause | Aaron Patterson | 2011-04-29 | 2 | -4/+16 |
| | |||||
* | Test that passing nil member of array in conditions retrieves records with nil | gmile | 2011-04-29 | 1 | -0/+22 |
| | | | | value on a selected field. | ||||
* | Merged pull request #344 from asanghi/callback_if. | José Valim | 2011-04-28 | 3 | -3/+17 |
|\ | | | | | :if should not fire on validations when not in context with :on | ||||
| * | fix typo | Aditya Sanghi | 2011-04-29 | 1 | -1/+1 |
| | | |||||
| * | :if should not fire on validations when not in context with :on | Aditya Sanghi | 2011-04-29 | 3 | -3/+17 |
|/ | |||||
* | Merge remote branch 'myron/am_disabling_fix_memory_leaks' | José Valim | 2011-04-28 | 3 | -56/+155 |
|\ | |||||
| * | Add additional tests for AM::ObserverArray that I had missed yesterday. | Myron Marston | 2011-04-28 | 1 | -1/+50 |
| | | |||||
| * | Fix bug with AM::Observer disablement. | Myron Marston | 2011-04-28 | 3 | -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 Marston | 2011-04-28 | 2 | -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 Marston | 2011-04-28 | 3 | -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 Patterson | 2011-04-28 | 1 | -3/+13 |
|/ | | | | versions of mysql | ||||
* | Merged pull request #327 from dcrec1/master. | José Valim | 2011-04-28 | 2 | -3/+17 |
|\ | | | | | Prefix option for number_to_human_size | ||||
| * | added a :prefix option to number_to_human_size | Diego Carrion | 2011-04-27 | 2 | -3/+17 |
| | | |||||
* | | Merged pull request #336 from neerajdotname/upgrade_rack_mount. | José Valim | 2011-04-28 | 1 | -1/+1 |
|\ \ | | | | | | | upgrade rack-mount to 0.7.2 | ||||
| * | | upgrade rack-mount | Neeraj Singh | 2011-04-28 | 1 | -1/+1 |
|/ / | | | | | | | Newer version is a few minor performance fixes | ||||
* | | Tidy up previous commit. | José Valim | 2011-04-28 | 1 | -3/+8 |
| | | |||||
* | | Merged pull request #219 from panthomakos/memcache. | José Valim | 2011-04-28 | 2 | -1/+42 |
|\ \ | | | | | | | Character encoding issues with MemCacheStore in 1.9.2 | ||||
| * | | Fixed special character encoding issue with MemCacheStore in Ruby 1.9.2. | Pan Thomakos | 2011-03-11 | 2 | -1/+42 |
| | | | |||||
* | | | Merged pull request #333 from jgarber/master. | José Valim | 2011-04-28 | 2 | -2/+13 |
|\ \ \ | | | | | | | | | Specific translations for labels with values | ||||
| * | | | Allow a label with the value option to have value-specific translations. | Jason Garber | 2011-04-27 | 2 | -2/+13 |
| | | | | |||||
* | | | | Revert "Handle enabling/disabling observers at different levels of the class ↵ | José Valim | 2011-04-28 | 3 | -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é Valim | 2011-04-28 | 2 | -13/+31 |
|\ \ \ \ | | | | | | | | | | | proper reset all inflector scopes | ||||
| * | | | | proper reset all inflector scopes | Stefan Huber | 2011-04-25 | 2 | -13/+31 |
| | | | | | |||||
* | | | | | Handle enabling/disabling observers at different levels of the class hierarchy. | Myron Marston | 2011-04-28 | 3 | -3/+75 |
| | | | | | | | | | | | | | | | | | | | | Last call wins. | ||||
* | | | | | Allow observers to be enabled and disabled. | Myron Marston | 2011-04-28 | 5 | -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 Marston | 2011-04-28 | 1 | -1/+5 |
| |/ / / |/| | | | |||||
* | | | | requiring a newer version of the mysql2 gem | Aaron Patterson | 2011-04-27 | 2 | -1/+2 |
| |_|/ |/| | | |||||
* | | | Merged pull request #325 from joshk/mass_assignment_tests_fixed. | Aaron Patterson | 2011-04-27 | 1 | -7/+7 |
|\ \ \ | | | | | | | | | final corrections to the mass-assignment security tests | ||||
| * | | | some test renaming to avoid collisions, and some annoying issues between dbs | Josh Kalderimis | 2011-04-27 | 1 | -7/+7 |
|/ / / |