aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| * | Makes text_helper methods sanitize the input if the input is not safe or ↵Santiago Pastorino2010-06-072-22/+118
| | | | | | | | | | | | :safe => true option is not provided
| * | content_tag_string shouldn't escape_html if escape param is falseSantiago Pastorino2010-06-072-1/+3
| | |
| * | Make named helpers unprotected without becoming actions [#4696 state:resolved]wycats2010-06-072-1/+12
| | |
| * | Fixed Load Error failures in 1.9.2-headRizwan Reza2010-06-071-0/+1
| | |
| * | bump sqlite version to 1.3.0Santiago Pastorino2010-06-071-1/+1
| | | | | | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com>
| * | Merge remote branch 'rails/master'Xavier Noria2010-06-0734-189/+266
| |\ \
| | * | member on resource should not expect an ID.José Valim2010-06-072-6/+3
| | | |
| | * | Make the logic for nested_records_changed_for_autosave? simpler.José Valim2010-06-071-9/+5
| | | | | | | | | | | | | | | | [#4648 state:resolved]
| | * | Fixing test class names and refactor line in autosave associationCarlos Antonio da Silva2010-06-073-7/+7
| | | | | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| | * | Require active support/string/conversions so constantize can be used in ↵Tom Meier2010-06-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | associations.rb Signed-off-by: José Valim <jose.valim@gmail.com>
| | * | Make AP test suite green once again and speed up performance in layouts ↵José Valim2010-06-074-45/+39
| | | | | | | | | | | | | | | | lookup for some cases.
| | * | Observing module is using constantizeSantiago Pastorino2010-06-061-0/+1
| | | |
| | * | oops, two cancelling errors made a previous test pass, fixing itXavier Noria2010-06-071-1/+1
| | | |
| | * | the order in which we apply deltas in Date#advance matters, add test ↵Xavier Noria2010-06-071-0/+10
| | | | | | | | | | | | | | | | coverage for that
| | * | Router accepts member routes on resource. [#4624 state:resolved]Rizwan Reza2010-06-062-5/+27
| | | |
| | * | Formats should always be an array.Jeremy Kemper2010-06-061-1/+1
| | | |