Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | 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 a changelog entry about fda24312d3. | |||||
| * | | | 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 | |||||
| * | | | 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 in ConnectionSpecification | |||||
| * | | | 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 for postgresql | |||||
| * | | | 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 active record from method | |||||
| * | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since composed_of was removed in 051747449e7afc817c599e4135bc629d4de064eb, these tests were working "by mistake", due to the matching "address" string in the error message, but with a different error message than the expected multiparameter assignment error. Since "address" is not an attribute from Customer anymore, the error was "undefined method klass for nil", where nil was supposed to be the column object. | |||||
* | | | Move newly added multiparameter tests to base_test file | Carlos Antonio da Silva | 2012-06-28 | 2 | -35/+36 | |
| | | | | | | | | | | | | | | | All other multiparameter assignment tests are in the same file, so it makes sense to have all of them here. | |||||
* | | | 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 for Oracle database | |||||
| * | | | Skip test_setting_time_attribute because Oracle database | Yasuo Honda | 2012-06-28 | 1 | -0/+2 | |
|/ / / | | | | | | | | | | does not have TIME data type. | |||||
* | | | 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 | |||||
| * | | | Speed up Hash#transform_keys using Hash#each_key | Grant Hutchins | 2012-06-27 | 1 | -1/+1 | |
|/ / / | | | | | | | See https://gist.github.com/3007749 for justification | |||||
* | | | Merge pull request #6878 from masarakki/master | Rafael Mendonça França | 2012-06-27 | 5 | -0/+41 | |
|\ \ \ | | | | | | | | | | | | | | | | | fix bug in limit of enum columns of mysql Closes #6432 | |||||
| * | | | 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 | |||||
| * | | Fixes #6825, adds tests covering cases and error possibilities, also changes ↵ | Mauricio Linhares | 2012-06-27 | 3 | -16/+58 | |
|/ / | | | | | | | SQLite3 driver to correctly generate a time column instead of datetime | |||||
* | | Add changelog entry for polymorphic option in model generator | Carlos Antonio da Silva | 2012-06-27 | 1 | -0/+10 | |
| | | | | | | | | | | Pull request #6856, merged in 52f6e47682003c83b0466bf5e140ee302498a226. [ci skip] | |||||
* | | Merge pull request #6880 from kennyj/fix_20120628 | Carlos Antonio da Silva | 2012-06-27 | 2 | -2/+2 | |
|\ \ | | | | | | | Fix wrong testcase for db:test:prepare, and wrong environment in AR rake task. | |||||
| * | | 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 For instance, $ rails g model Product supplier:references{polymorphic} generate model with `belongs_to :supplier, polymorphic: true` association and appropriate migration. | |||||
| * | | | Add polymorphic option to model generator | Aleksey Magusev | 2012-06-27 | 4 | -14/+42 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For instance, $ rails g model Product supplier:references{polymorphic} generate model with `belongs_to :supplier, polymorphic: true` association and appropriate migration. Also fix model_generator_test.rb#L196 and #L201 | |||||
* | | | | 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 | |||||
| * | | | Address test_basic_model test error with Oracle enhanced adapter | Yasuo Honda | 2012-06-27 | 1 | -1/+1 | |
|/ / / | | | | | | | | | | which ids start from 1000 as a default. | |||||
* | | | Merge pull request #6863 from bcardarella/asyn-actionmailer-guides | Xavier Noria | 2012-06-26 | 1 | -0/+31 | |
|\ \ \ | | | | | | | | | Guide update for Async ActionMailer | |||||
| * | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we're dealing with a new array instance, it's safe to use map! and we avoid an extra array object. Also remove the symbolize_keys! from AttributeMethodMatcher, since it's an internal class that always receives symbol keys from the prefix/suffix methods implementations. | |||||
* | | | | Use default + merge! instead of reverse_merge | Carlos Antonio da Silva | 2012-06-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | Since we're not directly requiring the reverse_merge extension, we can avoid another hash creation by using default_hash.merge! instead. | |||||
* | | | | Set hash value instead of merge a single key, and use flatten! if possible | Carlos Antonio da Silva | 2012-06-26 | 2 | -4/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no need to create two extra hashes with options.merge(another_hash), with the goal of setting only one value, so lets just set it. Also refactor validates_each to use _merge_attributes, like other validates_* helpers do. | |||||
* | | | | Ensure Array#to_sentence does not modify given hash | Carlos Antonio da Silva | 2012-06-26 | 3 | -8/+14 | |
| | | | | | | | | | | | | | | | | | | | | Also simplify I18n logic for Array#to_sentence, doing only one lookup for all keys and using merge!, instead of one lookup for each option key. | |||||
* | | | | 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 ea... | |||||
| * | | | | Setup each test with default ActiveRecord timezone settings to ensure each ↵ | Erich Menge | 2012-06-26 | 1 | -20/+8 | |
|/ / / / | | | | | | | | | | | | | | | | | | | | | test starts with a clean slate. Fixes #6867. | |||||
* | | | | 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 | |||||
| * | | | | AS::Callbacks: deprecate monkey patch code | Bogdan Gusiev | 2012-06-26 | 5 | -1/+23 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Deprecate usage of filter object with #before and #after methods as around callback | |||||
* | | | | | 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 | |||||
| * | | | | | :update_details method no more exists on @lookup_context | Akira Matsuda | 2012-06-26 | 1 | -2/+1 | |
| |/ / / / | | | | | | | | | | | | | | | | the method has gone in this commit: 119e9e2dafb0cdc5b85613b730333679aef534af | |||||
* | | | | | Merge pull request #6839 from bcardarella/async-actionmailer | Aaron Patterson | 2012-06-26 | 8 | -0/+86 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Async actionmailer | |||||
| * | | | | Some final syntax fixes | Brian Cardarella | 2012-06-24 | 2 | -3/+2 | |
| | | | | | ||||||
| * | | | | Better documentation for ActionMailer.async | Brian Cardarella | 2012-06-24 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Better documentation for ActionMailer.async | Brian Cardarella | 2012-06-24 | 1 | -0/+4 | |
| | | | | | ||||||
| * | | | | Forcing the message sending is no longer necessary | Brian Cardarella | 2012-06-24 | 2 | -16/+1 | |
| | | | | |