aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Added :locale option explanation for number_to_currencySlobodan Kovacevic2010-06-101-0/+2
| |_|/ |/| |
* | | Merge remote branch 'rails/master'Xavier Noria2010-06-0877-646/+721
|\ \ \ | | |/ | |/|
| * | Add parentheses to avoid warnings when running AR tests.Emilio Tagua2010-06-081-4/+4
| |/ | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * 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.
| | | * ignore selects from data dictionary views when running tests on OracleRaimonds Simanovskis2010-06-041-1/+1
| | | |
| | | * fix conditions when DateTime#to_date and DateTime#xmlschema methods are definedRaimonds Simanovskis2010-06-043-6/+6
| | | |
| | | * assert log output match in case insensitive mode to avoid failure when ↵Raimonds Simanovskis2010-06-041-2/+2
| | | | | | | | | | | | | | | | quoted table name is in uppercase (when using Oracle)
| | | * downcase table names in aliased_table_name_for and ↵Raimonds Simanovskis2010-06-041-2/+4
| | | | | | | | | | | | | | | | references_eager_loaded_tables? methods (as Oracle quoted table names are in uppercase)
| | | * test fixes for Oracle enhanced adapter:Raimonds Simanovskis2010-06-042-3/+3
| | | | | | | | | | | | | | | | | | | | latest oracle_enhanced adapter does automatic shortening of index names ignore select from all_triggers table in assert_queries
| | | * do order by id when finding first fixture to ensure that it is correct oneRaimonds Simanovskis2010-06-041-1/+1
| | | | | | | | | | | | | | | | (as otherwise was failing under JRuby and oracle_enhanced adapter)
| | | * Oracle enhanced adapter now supports shortening of default generated index ↵Raimonds Simanovskis2010-06-041-12/+10
| | | | | | | | | | | | | | | | names, some additional tests now pass
| | | * Reduced size of table name prefix and suffix in migrations test as in Oracle ↵Raimonds Simanovskis2010-06-041-3/+4
| | | | | | | | | | | | | | | | identifier name cannot be larger than 30 characters
| | | * Explicitly set Topic model last_read attribute as Date value when Oracle ↵Raimonds Simanovskis2010-06-042-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | enhanced adapter is used (otherwise some tests are failing which assume that this attribute will have Date value)
| | | * create DateTime value with local offset as later it is compared to Time ↵Raimonds Simanovskis2010-06-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | value with local offset (otherwise test is failing for oracle_enhanced JDBC adapter)
| | * | If we undef <=>, it solves a problem involving comparison. Please figure out ↵wycats2010-06-071-0/+2
| | | | | | | | | | | | | | | | the root cause.
| | * | This test shouldn't rely on the order of the data returned by selectSantiago Pastorino2010-06-071-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| | * | Add shallow routes to the new router [Closes #3765]Diego Carrion2010-06-073-3/+75
| | | |
| | * | Really make include_root_in_json default to true [#3770 state:resolved]José Valim2010-06-083-29/+35
| | | |
| * | | Updating ActionMailer basics guide to have inline attachmentsMikel Lindsaar2010-06-072-0/+32
| | | |
| * | | Updating readme for ActionMailer::BaseMikel Lindsaar2010-06-071-1/+32
| | | |
| * | | Adding inline attachment support to ActionMailerMikel Lindsaar2010-06-076-2/+37
| | | |
| * | | Updating image_tag to support cid:content_id "URLs"Mikel Lindsaar2010-06-072-2/+14
| | | |
| * | | Merge branch 'master' of git://github.com/rails/railsMikel Lindsaar2010-06-0761-501/+899
| |\| |
| | * | regular expressions are usually ASCII-encoded, so force_encoding the content ↵wycats2010-06-072-2/+1
| | | | | | | | | | | | | | | | of a Node to the encoding of the regular expression is wrong.
| | * | Add delete to middleware stack proxy.José Valim2010-06-073-1/+11
| | | |
| | * | Fix case when rendering a partial inside RJS with inherited layout [#4786 ↵José Valim2010-06-072-1/+4
| | | | | | | | | | | | | | | | state:resolved]
| | * | Updating ActionMailer to Mail 2.2.2 (fixing two tests to suit)Mikel Lindsaar2010-06-072-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 09:19:57 +0000