aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Don't overwrite unsaved updates when loading an association but preserve the ↵James Le Cuirot2010-06-093-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 Pastorino2010-06-091-2/+2
| | | | | | 8.4 failing test Signed-off-by: José Valim <jose.valim@gmail.com>
* Should call configure! to initiliaze the applicationSantiago Pastorino2010-06-091-0/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* SQLite2Adapter doesn't existSantiago Pastorino2010-06-091-1/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Removed textilize, textilize_without_paragraph and markdown helpersSantiago Pastorino2010-06-094-195/+2
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Better test for ticket [#3914 state:resolved]Neeraj Singh2010-06-091-0/+11
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Merge branch 'master' of github.com:rails/railswycats2010-06-0824-114/+667
|\
| * Add more cases to previous commit [#4394 state:resolved]José Valim2010-06-082-3/+10
| |
| * Make sure namespaces are nested within resourcesJan De Poorter2010-06-082-0/+23
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * cache_sweeper yields blank outputNeeraj Singh2010-06-083-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 Durand2010-06-081-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 Kemper2010-06-085-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_listJeremy Kemper2010-06-081-7/+5
| |
| * Merge remote branch 'docrails/master'Xavier Noria2010-06-084-6/+117
| |\
| | * Merge remote branch 'rails/master'Xavier Noria2010-06-0877-646/+721
| | |\
| | * | AS guide: documents datetime calculationsXavier Noria2010-06-081-3/+114
| | | |
| | * | update docs before_validation_on_create => before_validation(:on => :create)Santiago Pastorino and José Ignacio Costa2010-06-071-1/+1
| | | |
| | * | getting started guide: mentions that last REE release does not have the bugs ↵Xavier Noria2010-06-071-1/+1
| | | | | | | | | | | | | | | | of MRI p248 and p249
| | * | getting started guide: mentions that last REE release does not have the bugs ↵Xavier Noria2010-06-071-1/+1
| | | | | | | | | | | | | | | | of MRI p248 and p249
| * | | Bring pg back.José Valim2010-06-081-1/+1
| | | |
| * | | Avoid PostgreSQL and MySQL tests warnings.Emilio Tagua2010-06-082-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 Hansson2010-06-083-75/+3
| | | | | | | | | | | | | | | | This reverts commit 67a60ee314f53abcde78f8ecd2a1f7c9ef8264e1.
| * | | Fix ActiveRecord::Base.compute_type swallowing NoMethodError. [#4751 ↵Andrew Bloomgarden2010-06-083-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * | | Memoize the object returned by _view in ActionView::TestCase::BehaviorDavid Chelimsky2010-06-082-6/+12
| | |/ | |/| | | | | | | | | | | | | [#4799 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * | Add parentheses to avoid warnings when running AR tests.Emilio Tagua2010-06-081-4/+4
| | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | | Update bundler dependencywycats2010-06-081-1/+1
|/ /
* | Bump Arel to 0.4.0Emilio Tagua2010-06-081-1/+1
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | Temporarily revert "Update after_commit and after_rollback docs and tests to ↵Jeremy Kemper2010-06-085-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 4David Heinemeier Hansson2010-06-0816-16/+16
| |
* | Fixed double output from cache in no caching modeDavid Heinemeier Hansson2010-06-082-29/+14
| |
* | forcing encoding on 1.9 when dealing with "binary" columns [#4612 ↵Aaron Patterson2010-06-081-0/+4
| | | | | | | | | | | | state:resolved] Signed-off-by: wycats <wycats@gmail.com>
* | Missing require restoredwycats2010-06-081-0/+1
| |
* | Accept both regexps and strings for LOCALHOST.José Valim2010-06-081-2/+2
| |
* | Require encoding.rbwycats2010-06-081-0/+1
| |
* | Make sure that rails recognized the full notation of IPv6 loopback address, ↵Prem Sichanugrist2010-06-082-3/+3
| | | | | | | | | | | | and recognize 127.0.0.0/8 in IPv4 Signed-off-by: José Valim <jose.valim@gmail.com>
* | Fix resources ignoring scope optionsAndrew White2010-06-082-4/+32
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | Made markdown honor :safe option and handle safe input. Also added tests for ↵rohit2010-06-083-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é Valim2010-06-081-3/+1
| |
* | Hide remaining generators hooks [#4790 state:resolved]José Valim2010-06-081-1/+5
| |
* | Add support for actions on a new resource to the new routing DSL [#4328 ↵Andrew White2010-06-082-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]rohit2010-06-082-1/+33
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | Fix multiple self-referencing eager loads failing to join multiple timesErnie Miller2010-06-082-3/+11
| | | | | | | | | | | | [#4679 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | Merge branch 'master' of git://github.com/rails/railsMikel Lindsaar2010-06-0822-80/+167
|\ \
| * | Move the undef into the 1.9 only branchwycats2010-06-071-2/+2
| | |
| * | Merge remote branch 'rsim/oracle_enhanced_rails3'wycats2010-06-0714-47/+54
| |\ \
| | * | compare sorted arrays in relations_testRaimonds Simanovskis2010-06-041-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 adapterRaimonds Simanovskis2010-06-041-1/+2
| | | |
| | * | fix test_belongs_to_with_primary_key_joins_on_correct_column test on OracleRaimonds Simanovskis2010-06-041-0/+4
| | | |
| | * | Downcase quoted table name in regex in count_aliases_from_table_joinsRaimonds Simanovskis2010-06-041-1/+2
| | | | | | | | | | | | | | | | Oracle adapter's quote_table_name returns quoted table name in uppercase and therefore it should be downcased before scanning downcased join_sql
| | * | Fixed adapter tests not to assert LIMIT and OFFSET in SQL stringsRaimonds Simanovskis2010-06-041-13/+4
| | | | | | | | | | | | | | | | Fixed adapter test cases that were failing in oracle because the asserts were looking for the presence of offset and limit which are not available in oracle. Changed the tests to check that the sql injection is not present in the output so that the tests are database adapter agnostic.