Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | Merge branch 'master' of git://github.com/rails/rails into rails | Mikel Lindsaar | 2010-01-19 | 357 | -3120/+6788 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fixing up base to refactor settings | Mikel Lindsaar | 2010-01-17 | 2 | -47/+31 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Updating mail require to 2.0.0 | Mikel Lindsaar | 2010-01-17 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Removed autoload of DeliveryMethods | Mikel Lindsaar | 2010-01-16 | 1 | -1/+0 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Migrated over to Mail doing delivery. | Mikel Lindsaar | 2010-01-16 | 5 | -45/+125 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Removing internal delivery agents | Mikel Lindsaar | 2010-01-16 | 5 | -141/+0 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Ensure root routes inside optional scopes works as expected. | José Valim | 2010-01-26 | 2 | -9/+17 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Ensure all initializers are collections. | José Valim | 2010-01-26 | 4 | -35/+36 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge branch 'master' of git://github.com/rails/rails | José Valim | 2010-01-25 | 1 | -0/+17 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: railties/test/railties/plugin_test.rb | |||||
| * | | | | | | | | | Failing test for plugin init requiring another plugin lib file | Joshua Peek | 2010-01-25 | 1 | -0/+17 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Add a deprecation for helpers_dir. | José Valim | 2010-01-25 | 2 | -2/+25 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Refactor some railties tests structure. | José Valim | 2010-01-25 | 4 | -56/+59 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | As first step setup the load path and lazy compare middlewares. | José Valim | 2010-01-25 | 6 | -26/+46 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Fix i18n locales order test. | José Valim | 2010-01-25 | 2 | -8/+14 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Failing test for using plugin middleware in application config | Joshua Peek | 2010-01-25 | 1 | -0/+20 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Plugins need to load before app initializers | Joshua Peek | 2010-01-25 | 2 | -1/+14 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Add active_model/railtie back to generated boot.rb, add models back to ↵ | José Valim | 2010-01-25 | 9 | -42/+45 | |
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | paths, load active_support/railtie since we need it and ensure default logger is set before config. | |||||
* | | | | | | | | Revamp of Rails documentation task | Rizwan Reza | 2010-01-24 | 1 | -23/+31 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local> | |||||
* | | | | | | | | Fix a couple failures on 1.9.1. | José Valim | 2010-01-24 | 2 | -5/+7 | |
| | | | | | | | | ||||||
* | | | | | | | | Use Rails::Application ref in Rakefile and console scripts. | Joshua Peek | 2010-01-24 | 3 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Less places you need to change if you rename your application. | |||||
* | | | | | | | | Add Rails::Application pointer to the default app to add symmetry to ↵ | Joshua Peek | 2010-01-24 | 2 | -2/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Foo::Application | |||||
* | | | | | | | | Fix failing tests after merge. | José Valim | 2010-01-24 | 6 | -8/+13 | |
| | | | | | | | | ||||||
* | | | | | | | | Ensure metals and initializers in plugins are loaded. | José Valim | 2010-01-24 | 10 | -29/+75 | |
| | | | | | | | | ||||||
* | | | | | | | | Add tests for plugin sanity check. | José Valim | 2010-01-24 | 3 | -3/+27 | |
| | | | | | | | | ||||||
* | | | | | | | | Rename plugin_name to railtie_name and engine_name. | José Valim | 2010-01-24 | 10 | -23/+19 | |
| | | | | | | | | ||||||
* | | | | | | | | Ensure environment config has higher priority than application ones. | José Valim | 2010-01-24 | 3 | -3/+16 | |
| | | | | | | | | ||||||
* | | | | | | | | Ensure helpers work from configured path. | José Valim | 2010-01-24 | 4 | -11/+12 | |
| | | | | | | | | ||||||
* | | | | | | | | Ensure namespaced controllers in engines work. | José Valim | 2010-01-24 | 4 | -22/+49 | |
| | | | | | | | | ||||||
* | | | | | | | | Add I18n tests to engines. | José Valim | 2010-01-24 | 3 | -56/+40 | |
| | | | | | | | | ||||||
* | | | | | | | | Load deprecated tasks for plugins. | José Valim | 2010-01-24 | 2 | -0/+45 | |
| | | | | | | | | ||||||
* | | | | | | | | Make plugin generator compatible with new schema. | José Valim | 2010-01-24 | 3 | -2/+2 | |
| | | | | | | | | ||||||
* | | | | | | | | Solve some pendencies. | José Valim | 2010-01-24 | 10 | -29/+38 | |
| | | | | | | | | ||||||
* | | | | | | | | Move console stuff to its own directory. | José Valim | 2010-01-23 | 5 | -6/+6 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge branch 'master' into app | José Valim | 2010-01-23 | 55 | -890/+303 | |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: railties/lib/rails/application.rb | |||||
| * | | | | | | | Make default_scope work with Relations | Pratik Naik | 2010-01-23 | 3 | -3/+15 | |
| | | | | | | | | ||||||
| * | | | | | | | I removed the rdoc task from plugin Rakefile | Joshua Peek | 2010-01-22 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Delegate App calls to instance | Joshua Peek | 2010-01-22 | 5 | -5/+11 | |
| | | | | | | | | ||||||
| * | | | | | | | Ensure strings given to render with slash are rendered relative to the ↵ | José Valim | 2010-01-22 | 4 | -52/+79 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configured _prefix. | |||||
| * | | | | | | | Add test case for load initializers before routing behavior. | Prem Sichanugrist | 2010-01-22 | 1 | -0/+28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | | | | | | | Add missing require for Object#try [#3771 state:resolved] | Xavier Noria | 2010-01-22 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
| * | | | | | | | Make @controller an internal ivar in the view | Joshua Peek | 2010-01-22 | 4 | -19/+17 | |
| | | | | | | | | ||||||
| * | | | | | | | Relation should respond to class methods | Pratik Naik | 2010-01-22 | 2 | -1/+6 | |
| | | | | | | | | ||||||
| * | | | | | | | Allow calling class methods on a Relation | Pratik Naik | 2010-01-22 | 2 | -0/+11 | |
| | | | | | | | | ||||||
| * | | | | | | | Use expand_path to require environment in metal template | Joshua Peek | 2010-01-22 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Include cascade header in metal template | Joshua Peek | 2010-01-22 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | lib is already included w/ rake test task | Joshua Peek | 2010-01-22 | 1 | -2/+0 | |
| | | | | | | | | ||||||
| * | | | | | | | Remove rdoc task from generated plugin Rakefile | Joshua Peek | 2010-01-22 | 1 | -10/+0 | |
| | | | | | | | | ||||||
| * | | | | | | | Template whitespace | Joshua Peek | 2010-01-22 | 8 | -8/+7 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
| * | | | | | | Revert "Refactoring attributes/types" [#3348 state:open] | Pratik Naik | 2010-01-22 | 25 | -775/+148 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f936a1f100e75082081e782e5cceb272885c2df7. Conflicts: activerecord/lib/active_record.rb activerecord/lib/active_record/base.rb Revert "Fixed: #without_typecast should only disable typecasting on the duplicated attributes" [#3387 state:open] This reverts commit 2831996483c6a045f1f38d8030256eb58d9771c3. Reason : It's not generating attribute methods properly, making object.column 5x slower. | |||||
| * | | | | | | Simplify finder method definitions | Pratik Naik | 2010-01-21 | 1 | -13/+11 | |
| | | | | | | |