Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Update documentation and change the range method name to delimiter. | Rafael Mendonça França | 2012-07-20 | 3 | -5/+7 | |
* | | | | | | | Don't pass `:within` option to the i18n | Rafael Mendonça França | 2012-07-20 | 3 | -2/+24 | |
* | | | | | | | `validates_inclusion_of` and `validates_exclusion_of` now accept | Rafael Mendonça França | 2012-07-20 | 3 | -3/+26 | |
* | | | | | | | Merge pull request #7099 from f1sherman/sweeper-clean-up-if-exception-raised | Rafael Mendonça França | 2012-07-20 | 2 | -2/+18 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Clean up Sweeper controller accessor when an Error is raised | Brian John | 2012-07-20 | 2 | -2/+18 | |
| |/ / / / / / | ||||||
* | | | | | | | Convert association macros to the new syntax | Jon Leighton | 2012-07-20 | 16 | -135/+136 | |
* | | | | | | | Avoid options ever being nil | Jon Leighton | 2012-07-20 | 2 | -8/+8 | |
* | | | | | | | Merge pull request #7106 from LTe/default_separator_updated | Carlos Antonio da Silva | 2012-07-20 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Use join without default separator | Piotr Niełacny | 2012-07-20 | 1 | -2/+2 | |
* | | | | | | | | Don't assume resource param is :id when using shallow routes | Andrew White | 2012-07-20 | 2 | -1/+15 | |
* | | | | | | | | Support constraints on resource custom params when nesting | Andrew White | 2012-07-20 | 2 | -9/+24 | |
* | | | | | | | | adding Rails::Queueing::Container | Aaron Patterson | 2012-07-19 | 4 | -6/+63 | |
* | | | | | | | | Merge pull request #7078 from kennyj/logging_query_plan | Rafael Mendonça França | 2012-07-19 | 2 | -2/+14 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Log query plan when we use count_by_sql method. | kennyj | 2012-07-18 | 2 | -2/+14 | |
* | | | | | | | | | Create default join table name using a Symbol | Carlos Antonio da Silva | 2012-07-19 | 1 | -1/+1 | |
| |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Use attributes instead of table names in migration example | José Valim | 2012-07-19 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #7097 from lexmag/join_table_gen_attr | José Valim | 2012-07-18 | 5 | -8/+24 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Add fkey attributes to `join_table` migration generator | Aleksey Magusev | 2012-07-19 | 5 | -8/+24 | |
* | | | | | | | | Revert "Merge pull request #7084 from LTe/logger_default_separator" | Aaron Patterson | 2012-07-18 | 2 | -14/+3 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #7095 from davekaro/master | Rafael Mendonça França | 2012-07-18 | 3 | -7/+7 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | revert Default timestamps to non-null | Dave Kroondyk | 2012-07-18 | 3 | -7/+7 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #6614 from carlosgaldino/data-confirm | Rafael Mendonça França | 2012-07-18 | 11 | -74/+58 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Remove `:confirm` in favor of `:data => { :confirm => 'Text' }` option | Carlos Galdino | 2012-07-18 | 11 | -74/+58 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #7084 from LTe/logger_default_separator | José Valim | 2012-07-18 | 2 | -3/+14 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Don't use default separator | Piotr Niełacny | 2012-07-18 | 2 | -3/+14 | |
* | | | | | | | | Update changelog for migration generator change | José Valim | 2012-07-18 | 1 | -0/+7 | |
* | | | | | | | | Merge pull request #7082 from jalkoby/lazy_lookup_in_abstract_controller | José Valim | 2012-07-18 | 2 | -1/+20 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | add lazy look up in abstract controller's translate method | Sergey Pchelincev | 2012-07-18 | 2 | -1/+20 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #7028 from lexmag/join_table_indexes | José Valim | 2012-07-18 | 7 | -16/+66 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add join table migration generator | Aleksey Magusev | 2012-07-18 | 7 | -16/+66 | |
* | | | | | | | | Merge pull request #6626 from route/render_formats | José Valim | 2012-07-17 | 12 | -4/+33 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Common behavior with adding formats to lookup_context for TemplateRenderer an... | Dmitry Vorotilin | 2012-07-18 | 12 | -4/+33 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #7081 from jfirebaugh/to_param_regression_master | Jon Leighton | 2012-07-17 | 2 | -1/+7 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | AR::Integration must be included after AM::Conversion | John Firebaugh | 2012-07-17 | 2 | -1/+7 | |
|/ / / / / / / / | ||||||
* | / / / / / / | Add support for optional root segments containing slashes | Andrew White | 2012-07-17 | 2 | -1/+28 | |
| |/ / / / / / |/| | | | | | | ||||||
* | | | | | | | Merge pull request #7076 from kennyj/fix_class_eval | Aaron Patterson | 2012-07-17 | 5 | -6/+6 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix class_eval without __FILE__ and __LINE__. | kennyj | 2012-07-18 | 5 | -6/+6 | |
* | | | | | | | | Merge pull request #7072 from beerlington/fix_validations_with_scope | Jon Leighton | 2012-07-17 | 2 | -1/+17 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Fixes "Cannot visit ..." with validates_uniqueness_of | beerlington | 2012-07-17 | 2 | -1/+17 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #7006 from jaredbeck/issue_7005_explain_asset_debug | Piotr Sarnacki | 2012-07-16 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | A more informative comment for config.asset.debug | Jared Beck | 2012-07-16 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #7066 from wkang/master | Rafael Mendonça França | 2012-07-16 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | Fix activerecord model to_ary method comment 'see also' link | Kang Wen | 2012-07-16 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-07-15 | 11 | -38/+218 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | session_id column is string in default | kennyj | 2012-07-15 | 1 | -1/+1 | |
| * | | | | | | add note about requiring gem dependencies before initialization [ci skip] | Francesco Rodriguez | 2012-07-13 | 1 | -6/+28 | |
| * | | | | | | Added note about feature requests and rails-core list. | Steve Klabnik | 2012-07-13 | 1 | -0/+2 | |
| * | | | | | | Updated with_routing example to 3.x syntax [ci skip] | Wojciech Wnętrzak | 2012-07-13 | 1 | -7/+4 | |
| * | | | | | | Change Assertion language to Expected/Actual from obj1/obj2 | Scott Stewart | 2012-07-12 | 1 | -5/+5 | |
| * | | | | | | Fixes typo in CommentsController#create example | Andy Lindeman | 2012-07-11 | 1 | -1/+1 |