Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove needless links and search box and update doc links | David Heinemeier Hansson | 2010-06-09 | 1 | -17/+0 |
| | |||||
* | You dont have to manually mention the application layout, its automatically used | David Heinemeier Hansson | 2010-06-09 | 1 | -1/+0 |
| | |||||
* | Don't overwrite unsaved updates when loading an association but preserve the ↵ | James Le Cuirot | 2010-06-09 | 3 | -3/+17 |
| | | | | | | order of the loaded records. [#4642 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Make sure about which is the first element of the query, fixes a postgresql ↵ | Santiago Pastorino | 2010-06-09 | 1 | -2/+2 |
| | | | | | | 8.4 failing test Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Should call configure! to initiliaze the application | Santiago Pastorino | 2010-06-09 | 1 | -0/+1 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | SQLite2Adapter doesn't exist | Santiago Pastorino | 2010-06-09 | 1 | -1/+1 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Removed textilize, textilize_without_paragraph and markdown helpers | Santiago Pastorino | 2010-06-09 | 4 | -195/+2 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Better test for ticket [#3914 state:resolved] | Neeraj Singh | 2010-06-09 | 1 | -0/+11 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Merge branch 'master' of github.com:rails/rails | wycats | 2010-06-08 | 24 | -114/+667 |
|\ | |||||
| * | Add more cases to previous commit [#4394 state:resolved] | José Valim | 2010-06-08 | 2 | -3/+10 |
| | | |||||
| * | Make sure namespaces are nested within resources | Jan De Poorter | 2010-06-08 | 2 | -0/+23 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | cache_sweeper yields blank output | Neeraj Singh | 2010-06-08 | 3 | -0/+10 |
| | | | | | | | | | | | | [#3914 state:open] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Make logic for after_commit and after_rollback :on option work like it does ↵ | Brian Durand | 2010-06-08 | 1 | -18/+33 |
| | | | | | | | | | | | | | | | | for validation callbacks. [#2991 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Revert "Temporarily revert "Update after_commit and after_rollback docs and ↵ | Jeremy Kemper | 2010-06-08 | 5 | -9/+440 |
| | | | | | | | | | | | | | | | | tests to use new style API with an :on options instead of on_* suffix." and "Add after_commit and after_rollback callbacks to ActiveRecord that are called after transactions either commit or rollback on all records saved or destroyed in the transaction."" This reverts commit 1b2941cba1165b0721f57524645fe378bee2a950. [#2991] | ||||
| * | Clarify Fixture#key_ and value_list | Jeremy Kemper | 2010-06-08 | 1 | -7/+5 |
| | | |||||
| * | Merge remote branch 'docrails/master' | Xavier Noria | 2010-06-08 | 4 | -6/+117 |
| |\ | |||||
| | * | Merge remote branch 'rails/master' | Xavier Noria | 2010-06-08 | 77 | -646/+721 |
| | |\ | |||||
| | * | | AS guide: documents datetime calculations | Xavier Noria | 2010-06-08 | 1 | -3/+114 |
| | | | | |||||
| | * | | update docs before_validation_on_create => before_validation(:on => :create) | Santiago Pastorino and José Ignacio Costa | 2010-06-07 | 1 | -1/+1 |
| | | | | |||||
| | * | | getting started guide: mentions that last REE release does not have the bugs ↵ | Xavier Noria | 2010-06-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | of MRI p248 and p249 | ||||
| | * | | getting started guide: mentions that last REE release does not have the bugs ↵ | Xavier Noria | 2010-06-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | of MRI p248 and p249 | ||||
| * | | | Bring pg back. | José Valim | 2010-06-08 | 1 | -1/+1 |
| | | | | |||||
| * | | | Avoid PostgreSQL and MySQL tests warnings. | Emilio Tagua | 2010-06-08 | 2 | -3/+6 |
| | | | | | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | | | Revert "Add shallow routes to the new router" for now. Needs more work. | David Heinemeier Hansson | 2010-06-08 | 3 | -75/+3 |
| | | | | | | | | | | | | | | | | This reverts commit 67a60ee314f53abcde78f8ecd2a1f7c9ef8264e1. | ||||
| * | | | Fix ActiveRecord::Base.compute_type swallowing NoMethodError. [#4751 ↵ | Andrew Bloomgarden | 2010-06-08 | 3 | -1/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | | | Memoize the object returned by _view in ActionView::TestCase::Behavior | David Chelimsky | 2010-06-08 | 2 | -6/+12 |
| | |/ | |/| | | | | | | | | | | | | | [#4799 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | | Add parentheses to avoid warnings when running AR tests. | Emilio Tagua | 2010-06-08 | 1 | -4/+4 |
| | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | | Update bundler dependency | wycats | 2010-06-08 | 1 | -1/+1 |
|/ / | |||||
* | | Bump Arel to 0.4.0 | Emilio Tagua | 2010-06-08 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Temporarily revert "Update after_commit and after_rollback docs and tests to ↵ | Jeremy Kemper | 2010-06-08 | 5 | -440/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | use new style API with an :on options instead of on_* suffix." and "Add after_commit and after_rollback callbacks to ActiveRecord that are called after transactions either commit or rollback on all records saved or destroyed in the transaction." This reverts commits d2a49e4b1f30c5997e169110eed94a55aee53f56 and da840d13da865331297d5287391231b1ed39721b. [#2991] Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/transactions.rb activerecord/test/cases/transaction_callbacks_test.rb | ||||
* | | Get ready for beta 4 | David Heinemeier Hansson | 2010-06-08 | 16 | -16/+16 |
| | | |||||
* | | Fixed double output from cache in no caching mode | David Heinemeier Hansson | 2010-06-08 | 2 | -29/+14 |
| | | |||||
* | | forcing encoding on 1.9 when dealing with "binary" columns [#4612 ↵ | Aaron Patterson | 2010-06-08 | 1 | -0/+4 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: wycats <wycats@gmail.com> | ||||
* | | Missing require restored | wycats | 2010-06-08 | 1 | -0/+1 |
| | | |||||
* | | Accept both regexps and strings for LOCALHOST. | José Valim | 2010-06-08 | 1 | -2/+2 |
| | | |||||
* | | Require encoding.rb | wycats | 2010-06-08 | 1 | -0/+1 |
| | | |||||
* | | Make sure that rails recognized the full notation of IPv6 loopback address, ↵ | Prem Sichanugrist | 2010-06-08 | 2 | -3/+3 |
| | | | | | | | | | | | | and recognize 127.0.0.0/8 in IPv4 Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Fix resources ignoring scope options | Andrew White | 2010-06-08 | 2 | -4/+32 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Made markdown honor :safe option and handle safe input. Also added tests for ↵ | rohit | 2010-06-08 | 3 | -2/+39 |
| | | | | | | | | | | | | | | | | markdown. [#4794 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Fix generator test broken when rails new was added. | José Valim | 2010-06-08 | 1 | -3/+1 |
| | | |||||
* | | Hide remaining generators hooks [#4790 state:resolved] | José Valim | 2010-06-08 | 1 | -1/+5 |
| | | |||||
* | | Add support for actions on a new resource to the new routing DSL [#4328 ↵ | Andrew White | 2010-06-08 | 2 | -29/+118 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Fixed textilize_without_paragraph and added tests for it. [#4792 state:resolved] | rohit | 2010-06-08 | 2 | -1/+33 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Fix multiple self-referencing eager loads failing to join multiple times | Ernie Miller | 2010-06-08 | 2 | -3/+11 |
| | | | | | | | | | | | | [#4679 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | Merge branch 'master' of git://github.com/rails/rails | Mikel Lindsaar | 2010-06-08 | 22 | -80/+167 |
|\ \ | |||||
| * | | Move the undef into the 1.9 only branch | wycats | 2010-06-07 | 1 | -2/+2 |
| | | | |||||
| * | | Merge remote branch 'rsim/oracle_enhanced_rails3' | wycats | 2010-06-07 | 14 | -47/+54 |
| |\ \ | |||||
| | * | | compare sorted arrays in relations_test | Raimonds Simanovskis | 2010-06-04 | 1 | -1/+1 |
| | | | | | | | | | | | | Oracle does not guarantee that SELECT will return records ordered by primary key | ||||
| | * | | ignore raw_sql_ table alias that is used by Oracle adapter | Raimonds Simanovskis | 2010-06-04 | 1 | -1/+2 |
| | | | | |||||
| | * | | fix test_belongs_to_with_primary_key_joins_on_correct_column test on Oracle | Raimonds Simanovskis | 2010-06-04 | 1 | -0/+4 |
| | | | |