| Commit message (Expand) | Author | Age | Files | Lines |
* | Revert "Allow loading external route files from the router" | José Valim | 2012-06-29 | 10 | -149/+6 |
* | Remove unused responsibilities and add a few load definitions to engines | José Valim | 2012-06-29 | 5 | -148/+141 |
* | Remove unnecessary Railties structure now that plugins are gone | José Valim | 2012-06-29 | 5 | -121/+85 |
* | Depend on thor 0.15.4 | José Valim | 2012-06-29 | 1 | -1/+1 |
* | Rename RouteInspect to RoutesInspector for consistency | José Valim | 2012-06-29 | 4 | -7/+7 |
* | Merge pull request #6905 from kennyj/add_changelog_entry_20120629 | Santiago Pastorino | 2012-06-29 | 1 | -0/+15 |
|\ |
|
| * | Added an entry about fda24312d3 in the CHANGELOG. | kennyj | 2012-06-29 | 1 | -0/+15 |
|/ |
|
* | Merge pull request #6902 from frodsan/mailer_async_doc | Carlos Antonio da Silva | 2012-06-28 | 2 | -31/+33 |
|\ |
|
| * | fix ActionMailer::Async docs and update to follow coding conventions | Francesco Rodriguez | 2012-06-28 | 2 | -31/+33 |
|/ |
|
* | Merge pull request #6900 from cbandy/issue-6898 | Carlos Antonio da Silva | 2012-06-28 | 1 | -0/+2 |
|\ |
|
| * | Require URI | Chris Bandy | 2012-06-28 | 1 | -0/+2 |
|/ |
|
* | Merge pull request #6895 from kennyj/support_collate_for_postgresql | Rafael Mendonça França | 2012-06-28 | 4 | -1/+40 |
|\ |
|
| * | Support collate and ctype on the PostgreSQL. | kennyj | 2012-06-29 | 4 | -1/+40 |
|/ |
|
* | Merge pull request #6894 from subbarao/master | Rafael Mendonça França | 2012-06-28 | 1 | -2/+2 |
|\ |
|
| * | fixing typo in from documentation | Subba Rao Pasupuleti | 2012-06-28 | 1 | -2/+2 |
|/ |
|
* | Remove some aggregation tests related to composed_of | Carlos Antonio da Silva | 2012-06-28 | 2 | -21/+0 |
* | Move newly added multiparameter tests to base_test file | Carlos Antonio da Silva | 2012-06-28 | 2 | -35/+36 |
* | Bump minitest to 3.2.0 | Santiago Pastorino | 2012-06-28 | 1 | -1/+1 |
* | Merge pull request #6890 from yahonda/address_test_setting_time_attribute_oracle | Carlos Antonio da Silva | 2012-06-28 | 1 | -0/+2 |
|\ |
|
| * | Skip test_setting_time_attribute because Oracle database | Yasuo Honda | 2012-06-28 | 1 | -0/+2 |
|/ |
|
* | Merge pull request #6886 from nertzy/faster_stringify_and_symbolize_keys | Carlos Antonio da Silva | 2012-06-27 | 1 | -1/+1 |
|\ |
|
| * | Speed up Hash#transform_keys using Hash#each_key | Grant Hutchins | 2012-06-27 | 1 | -1/+1 |
|/ |
|
* | Merge pull request #6878 from masarakki/master | Rafael Mendonça França | 2012-06-27 | 5 | -0/+41 |
|\ |
|
| * | fix: limit of enum columns of mysql | Yamada Masaki | 2012-06-28 | 5 | -0/+41 |
|/ |
|
* | Merge pull request #6873 from mauricio/fix-for-6825 | Rafael Mendonça França | 2012-06-27 | 3 | -16/+58 |
|\ |
|
| * | Fixes #6825, adds tests covering cases and error possibilities, also changes ... | Mauricio Linhares | 2012-06-27 | 3 | -16/+58 |
|/ |
|
* | Add changelog entry for polymorphic option in model generator | Carlos Antonio da Silva | 2012-06-27 | 1 | -0/+10 |
* | Merge pull request #6880 from kennyj/fix_20120628 | Carlos Antonio da Silva | 2012-06-27 | 2 | -2/+2 |
|\ |
|
| * | Fix wrong environment. env should be RAILS_ENV or test. | kennyj | 2012-06-28 | 1 | -1/+1 |
| * | Fix wrong testcase. This is a testcase for db:test:prepare. | kennyj | 2012-06-28 | 1 | -1/+1 |
* | | Merge pull request #6856 from lexmag/polymorphic_generators | Carlos Antonio da Silva | 2012-06-27 | 4 | -14/+42 |
|\ \ |
|
| * | | Add polymorphic option to model generator | Aleksey Magusev | 2012-06-27 | 4 | -14/+42 |
* | | | Merge pull request #6879 from yahonda/address_basic_inclusion_model_test_oracle | Rafael Mendonça França | 2012-06-27 | 1 | -1/+1 |
|\ \ \
| |_|/
|/| | |
|
| * | | Address test_basic_model test error with Oracle enhanced adapter | Yasuo Honda | 2012-06-27 | 1 | -1/+1 |
|/ / |
|
* | | Merge pull request #6863 from bcardarella/asyn-actionmailer-guides | Xavier Noria | 2012-06-26 | 1 | -0/+31 |
|\ \ |
|
| * | | Guide update for Async ActionMailer | Brian Cardarella | 2012-06-26 | 1 | -0/+31 |
* | | | Refactor attribute method matcher to use Hash#fetch | Carlos Antonio da Silva | 2012-06-26 | 1 | -5/+3 |
* | | | Cleanup attribute methods a bit, use map! when accepting *args | Carlos Antonio da Silva | 2012-06-26 | 1 | -17/+12 |
* | | | Use default + merge! instead of reverse_merge | Carlos Antonio da Silva | 2012-06-26 | 1 | -1/+1 |
* | | | Set hash value instead of merge a single key, and use flatten! if possible | Carlos Antonio da Silva | 2012-06-26 | 2 | -4/+5 |
* | | | Ensure Array#to_sentence does not modify given hash | Carlos Antonio da Silva | 2012-06-26 | 3 | -8/+14 |
* | | | Merge pull request #6870 from erichmenge/patch/base_test_oracle | Rafael Mendonça França | 2012-06-26 | 1 | -20/+8 |
|\ \ \ |
|
| * | | | Setup each test with default ActiveRecord timezone settings to ensure each te... | Erich Menge | 2012-06-26 | 1 | -20/+8 |
|/ / / |
|
* | | | Remove file added by mistake at 88230b7cf77181c2088cce3314493caa9b3ac1fb | Rafael Mendonça França | 2012-06-26 | 1 | -1/+0 |
* | | | Merge pull request #6859 from bogdan/deprecate_monkey_patch | José Valim | 2012-06-26 | 5 | -1/+23 |
|\ \ \ |
|
| * | | | AS::Callbacks: deprecate monkey patch code | Bogdan Gusiev | 2012-06-26 | 5 | -1/+23 |
* | | | | Merge pull request #6858 from amatsuda/av_no_such_method_update_details | José Valim | 2012-06-26 | 1 | -2/+1 |
|\ \ \ \ |
|
| * | | | | :update_details method no more exists on @lookup_context | Akira Matsuda | 2012-06-26 | 1 | -2/+1 |
| |/ / / |
|
* | | | | Merge pull request #6839 from bcardarella/async-actionmailer | Aaron Patterson | 2012-06-26 | 8 | -0/+86 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Some final syntax fixes | Brian Cardarella | 2012-06-24 | 2 | -3/+2 |