| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | 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 | |
| | | | | | ||||||
| | | | * | Downcase quoted table name in regex in count_aliases_from_table_joins | Raimonds Simanovskis | 2010-06-04 | 1 | -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 strings | Raimonds Simanovskis | 2010-06-04 | 1 | -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 Oracle | Raimonds Simanovskis | 2010-06-04 | 1 | -1/+1 | |
| | | | | | ||||||
| | | | * | fix conditions when DateTime#to_date and DateTime#xmlschema methods are defined | Raimonds Simanovskis | 2010-06-04 | 3 | -6/+6 | |
| | | | | | ||||||
| | | | * | assert log output match in case insensitive mode to avoid failure when ↵ | Raimonds Simanovskis | 2010-06-04 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | quoted table name is in uppercase (when using Oracle) | |||||
| | | | * | downcase table names in aliased_table_name_for and ↵ | Raimonds Simanovskis | 2010-06-04 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | | | references_eager_loaded_tables? methods (as Oracle quoted table names are in uppercase) | |||||
| | | | * | test fixes for Oracle enhanced adapter: | Raimonds Simanovskis | 2010-06-04 | 2 | -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 one | Raimonds Simanovskis | 2010-06-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | (as otherwise was failing under JRuby and oracle_enhanced adapter) | |||||
| | | | * | Oracle enhanced adapter now supports shortening of default generated index ↵ | Raimonds Simanovskis | 2010-06-04 | 1 | -12/+10 | |
| | | | | | | | | | | | | | | | | | names, some additional tests now pass | |||||
| | | | * | Reduced size of table name prefix and suffix in migrations test as in Oracle ↵ | Raimonds Simanovskis | 2010-06-04 | 1 | -3/+4 | |
| | | | | | | | | | | | | | | | | | identifier name cannot be larger than 30 characters | |||||
| | | | * | Explicitly set Topic model last_read attribute as Date value when Oracle ↵ | Raimonds Simanovskis | 2010-06-04 | 2 | -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 Simanovskis | 2010-06-04 | 1 | -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 ↵ | wycats | 2010-06-07 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | the root cause. | |||||
| | | * | | This test shouldn't rely on the order of the data returned by select | Santiago Pastorino | 2010-06-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| | | * | | Add shallow routes to the new router [Closes #3765] | Diego Carrion | 2010-06-07 | 3 | -3/+75 | |
| | | | | | ||||||
| | | * | | Really make include_root_in_json default to true [#3770 state:resolved] | José Valim | 2010-06-08 | 3 | -29/+35 | |
| | | | | | ||||||
| | * | | | Updating ActionMailer basics guide to have inline attachments | Mikel Lindsaar | 2010-06-07 | 2 | -0/+32 | |
| | | | | | ||||||
| | * | | | Updating readme for ActionMailer::Base | Mikel Lindsaar | 2010-06-07 | 1 | -1/+32 | |
| | | | | | ||||||
| | * | | | Adding inline attachment support to ActionMailer | Mikel Lindsaar | 2010-06-07 | 6 | -2/+37 | |
| | | | | | ||||||
| | * | | | Updating image_tag to support cid:content_id "URLs" | Mikel Lindsaar | 2010-06-07 | 2 | -2/+14 | |
| | | | | | ||||||
| | * | | | Merge branch 'master' of git://github.com/rails/rails | Mikel Lindsaar | 2010-06-07 | 61 | -501/+899 | |
| | |\| | | ||||||
| | | * | | regular expressions are usually ASCII-encoded, so force_encoding the content ↵ | wycats | 2010-06-07 | 2 | -2/+1 | |
| | | | | | | | | | | | | | | | | | of a Node to the encoding of the regular expression is wrong. | |||||
| | | * | | Add delete to middleware stack proxy. | José Valim | 2010-06-07 | 3 | -1/+11 | |
| | | | | | ||||||
| | | * | | Fix case when rendering a partial inside RJS with inherited layout [#4786 ↵ | José Valim | 2010-06-07 | 2 | -1/+4 | |
| | | | | | | | | | | | | | | | | | state:resolved] | |||||
| | | * | | Updating ActionMailer to Mail 2.2.2 (fixing two tests to suit) | Mikel Lindsaar | 2010-06-07 | 2 | -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 Pastorino | 2010-06-07 | 2 | -22/+118 | |
| | | | | | | | | | | | | | | | | | :safe => true option is not provided | |||||
| | | * | | content_tag_string shouldn't escape_html if escape param is false | Santiago Pastorino | 2010-06-07 | 2 | -1/+3 | |
| | | | | | ||||||
| | | * | | Make named helpers unprotected without becoming actions [#4696 state:resolved] | wycats | 2010-06-07 | 2 | -1/+12 | |
| | | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |