Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge pull request #5843 from kuroda/translation_of_deeply_nested_model_attri... | José Valim | 2012-05-29 | 2 | -2/+7 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix human attribute_name to handle deeply nested attributes | Tsutomu Kuroda | 2012-05-16 | 2 | -2/+7 | |
* | | | | | | | | | Merge pull request #6546 from erichmenge/patch-as-json | Jeremy Kemper | 2012-05-29 | 2 | -9/+15 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | True, False, and Nil should be represented in as_json as themselves. | Erich Menge | 2012-05-29 | 2 | -9/+15 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #6502 from rafmagana/guides_refactor_rakefile | Xavier Noria | 2012-05-29 | 3 | -22/+89 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | ||||||
| * | | | | | | | | [guides] fix reference to railties directory, guides are no longer there | Rafael Magana | 2012-05-28 | 1 | -1/+1 | |
| * | | | | | | | | [guides] guides:generate:kindle is the new interface to generate .mobi file i... | Rafael Magana | 2012-05-28 | 3 | -18/+3 | |
| * | | | | | | | | [guides] get rid of any reference to the generator script since rake tasks ar... | Rafael Magana | 2012-05-28 | 2 | -6/+4 | |
| * | | | | | | | | [guides] update generator.rb to refer to guides:generate instead of generate_... | Rafael Magana | 2012-05-27 | 1 | -1/+1 | |
| * | | | | | | | | [guides] update guides guidelines with the new generation and validation rake... | Rafael Magana | 2012-05-27 | 1 | -5/+23 | |
| * | | | | | | | | [guides] Add rake task to show help and make it the default one | Rafael Magana | 2012-05-26 | 1 | -0/+50 | |
| * | | | | | | | | [guides] Add :guides namespace and :html and :kindle tasks to Rakefile | Rafael Magana | 2012-05-26 | 1 | -9/+25 | |
* | | | | | | | | | copy edits the upgrading guide | Xavier Noria | 2012-05-29 | 1 | -9/+9 | |
* | | | | | | | | | Merge pull request #6518 from kennyj/fix_5847-4 | José Valim | 2012-05-29 | 11 | -2/+83 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix #5847 and #4045 on master. | kennyj | 2012-05-30 | 1 | -0/+2 | |
| * | | | | | | | | | Use runner hook to load ActiveRecord::Base. | kennyj | 2012-05-30 | 1 | -0/+4 | |
| * | | | | | | | | | Add support runner hook. | kennyj | 2012-05-29 | 6 | -0/+53 | |
| * | | | | | | | | | SchemaMigration should be loaded lazily. | kennyj | 2012-05-29 | 3 | -2/+1 | |
| * | | | | | | | | | Add a testcase for #5847. | kennyj | 2012-05-29 | 1 | -0/+23 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #6535 from arunagw/jruby_module_test | Carlos Antonio da Silva | 2012-05-29 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | JRuby return different Array for module contents. | Arun Agrawal | 2012-05-29 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #6525 from freerange/minitest-passthrough-exceptions | José Valim | 2012-05-29 | 2 | -8/+62 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Avoid dependency on MiniTest::Unit::TestCase::PASSTHROUGH_EXCEPTIONS. | James Mead | 2012-05-29 | 1 | -2/+10 | |
| * | | | | | | | | | Exceptions like Interrupt should not be rescued. | James Mead | 2012-05-28 | 2 | -8/+54 | |
* | | | | | | | | | | Merge pull request #6528 from frodsan/update_hash_syntax_gemfile_template | José Valim | 2012-05-29 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | update Gemfile template to 1.9 hash syntax | Francesco Rodriguez | 2012-05-29 | 1 | -1/+1 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #6526 from appfolio/decoupling_activesupport_from_actionivew | Carlos Antonio da Silva | 2012-05-28 | 2 | -4/+44 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | decoupling activesupport performance testing from actionview and adding tests | Andrew Mutz | 2012-05-28 | 2 | -4/+44 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #6527 from frodsan/add_test_to_delete_by_fixnum_or_string | Carlos Antonio da Silva | 2012-05-28 | 1 | -0/+20 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Add tests to delete by fixnum or string id with has many through associations | Francesco Rodriguez | 2012-05-28 | 1 | -0/+20 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Add note about CollectionAssociation#delete change to upgrading guide [ci skip] | Carlos Antonio da Silva | 2012-05-29 | 1 | -0/+4 | |
* | | | | | | | | | | Fix failing build related to change in CollectionAssociation#delete | Carlos Antonio da Silva | 2012-05-29 | 1 | -1/+1 | |
* | | | | | | | | | | Review requires from number helper | Carlos Antonio da Silva | 2012-05-28 | 3 | -15/+11 | |
* | | | | | | | | | | Yield only one argument instead of splatting. | Carlos Antonio da Silva | 2012-05-28 | 2 | -2/+9 | |
* | | | | | | | | | | Allow blocks for count with ActiveRecord::Relation. Document and test that su... | chrisfinne | 2012-05-28 | 2 | -3/+30 | |
* | | | | | | | | | | Merge pull request #6511 from frodsan/add_fixnum_string_support_for_delete | Carlos Antonio da Silva | 2012-05-28 | 4 | -3/+57 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Add support for CollectionAssociation#delete by Fixnum or String | Francesco Rodriguez | 2012-05-28 | 4 | -3/+57 | |
* | | | | | | | | | | | Parse float value only once in number helpers | Carlos Antonio da Silva | 2012-05-28 | 1 | -11/+11 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #6522 from lest/patch-1 | José Valim | 2012-05-28 | 3 | -5/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | make AS::Multibyte::Chars work w/o multibyte core ext | Sergey Nartimov | 2012-05-28 | 1 | -1/+1 | |
| * | | | | | | | | | remove unnecessary require | Sergey Nartimov | 2012-05-28 | 2 | -4/+0 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #6517 from purcell/validates-false-value | José Valim | 2012-05-28 | 3 | -0/+8 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Don't enable validations when passing false hash values to ActiveModel.validates | Steve Purcell | 2012-05-28 | 3 | -0/+8 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #6512 from jaredbeck/fix_number_to_currency_neg_format | José Valim | 2012-05-28 | 2 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix handling of negative zero in number_to_currency | Jared Beck | 2012-05-28 | 2 | -1/+3 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #6315 from appfolio/moving_number_helper_methods_to_active... | José Valim | 2012-05-28 | 13 | -287/+1536 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Moving NumberHelpers from ActionView to ActiveSupport | Andrew Mutz | 2012-05-27 | 13 | -287/+1536 | |
| | |_|_|/ / / / / | |/| | | | | | | | ||||||
* / | | | | | | | | Fix sorting of helpers from different paths | Piotr Sarnacki | 2012-05-28 | 6 | -2/+57 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-27 | 5 | -17/+68 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | copy edits [ci skip] | Vijay Dev | 2012-05-27 | 1 | -3/+3 |