aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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, a...Prem Sichanugrist2010-06-082-3/+3
* Fix resources ignoring scope optionsAndrew White2010-06-082-4/+32
* Made markdown honor :safe option and handle safe input. Also added tests for ...rohit2010-06-083-2/+39
* 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 state...Andrew White2010-06-082-29/+118
* Fixed textilize_without_paragraph and added tests for it. [#4792 state:resolved]rohit2010-06-082-1/+33
* Fix multiple self-referencing eager loads failing to join multiple timesErnie Miller2010-06-082-3/+11
* 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
| | * 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
| | * Fixed adapter tests not to assert LIMIT and OFFSET in SQL stringsRaimonds Simanovskis2010-06-041-13/+4
| | * 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 quoted...Raimonds Simanovskis2010-06-041-2/+2
| | * downcase table names in aliased_table_name_for and references_eager_loaded_ta...Raimonds Simanovskis2010-06-041-2/+4
| | * test fixes for Oracle enhanced adapter:Raimonds Simanovskis2010-06-042-3/+3
| | * do order by id when finding first fixture to ensure that it is correct oneRaimonds Simanovskis2010-06-041-1/+1
| | * Oracle enhanced adapter now supports shortening of default generated index na...Raimonds Simanovskis2010-06-041-12/+10
| | * Reduced size of table name prefix and suffix in migrations test as in Oracle ...Raimonds Simanovskis2010-06-041-3/+4
| | * Explicitly set Topic model last_read attribute as Date value when Oracle enha...Raimonds Simanovskis2010-06-042-3/+10
| | * create DateTime value with local offset as later it is compared to Time value...Raimonds Simanovskis2010-06-041-1/+3
| * | If we undef <=>, it solves a problem involving comparison. Please figure out ...wycats2010-06-071-0/+2
| * | This test shouldn't rely on the order of the data returned by selectSantiago Pastorino2010-06-071-1/+1
| * | 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
| * | Add delete to middleware stack proxy.José Valim2010-06-073-1/+11
| * | Fix case when rendering a partial inside RJS with inherited layout [#4786 sta...José Valim2010-06-072-1/+4
| * | Updating ActionMailer to Mail 2.2.2 (fixing two tests to suit)Mikel Lindsaar2010-06-072-4/+4
| * | Makes text_helper methods sanitize the input if the input is not safe or :saf...Santiago Pastorino2010-06-072-22/+118
| * | 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
| * | 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
| | * | Fixing test class names and refactor line in autosave associationCarlos Antonio da Silva2010-06-073-7/+7