| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | Merge branch 'master' of github.com:lifo/docrails | Alvaro Pereyra | 2012-05-28 | 2 | -2/+0 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | fix empty lines [ci skip] | Francesco Rodriguez | 2012-05-28 | 2 | -2/+0 | |
| | | | | | | | | ||||||
| | * | | | | | | Updates examples for FinderMethods [ci skip] | Alvaro Pereyra | 2012-05-28 | 1 | -2/+14 | |
| | |/ / / / / | ||||||
| | * | | | | | Merge branch 'master' of github.com:lifo/docrails | Alvaro Pereyra | 2012-05-28 | 320 | -683/+3195 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | remove :nodoc: from Class#subclasses [ci skip] | Francesco Rodriguez | 2012-05-28 | 1 | -4/+10 | |
| | | | | | | | | ||||||
| | | * | | | | | [command line guide] Use actual output of a Rails 3.2.x app | Rafael Magana | 2012-05-28 | 1 | -102/+96 | |
| | | | | | | | | ||||||
| | | * | | | | | Merge pull request #102 from xenda/master | Xenda | 2012-05-27 | 1 | -4/+4 | |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Small fix to update the README using more up to date conventions. | |||||
| | | * | | | | | | add :locale option to Array#to_sentence documentation [ci skip] | Francesco Rodriguez | 2012-05-28 | 1 | -0/+27 | |
| | | | | | | | | | ||||||
| | | * | | | | | | add examples to Array#to_sentence [ci skip] | Francesco Rodriguez | 2012-05-28 | 1 | -4/+24 | |
| | | | | | | | | | ||||||
| | | * | | | | | | update documentation of array/access methods [ci skip] | Francesco Rodriguez | 2012-05-28 | 1 | -8/+16 | |
| | | | | | | | | | ||||||
| | | * | | | | | | [security guide] use info, note and warning where applicable | Rafael Magana | 2012-05-28 | 1 | -34/+34 | |
| | | | | | | | | | ||||||
| | | * | | | | | | Merge pull request #101 from lazylester/master | Francesco Rodríguez | 2012-05-27 | 1 | -0/+6 | |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | small addition to engines guide | |||||
| | | | * | | | | | | add small note about how to get the full list of options for rails plugin new | Les Nightingill | 2012-05-26 | 1 | -0/+6 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | "a sql" -> "an SQL" per API documentation guidelines | Mark Rushakoff | 2012-05-27 | 2 | -2/+2 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | some asset path changes and formatting fixes in AV overview [ci skip] | Vijay Dev | 2012-05-27 | 1 | -12/+10 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Adds examples to FinderMethods#first [ci skip] | Alvaro Pereyra | 2012-05-28 | 1 | -0/+1 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Updates documentation with cleaner examples and texts [ci skip] | Alvaro Pereyra | 2012-05-28 | 2 | -1/+15 | |
| | | |_|/ / / / / | |/| | | | | | | ||||||
| | * | | | | | | | Updates validations examples to be more attuned on the new Rails 3.0 conventions | Alvaro Pereyra | 2012-05-28 | 1 | -4/+4 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #6551 from kennyj/add_entry_20120531 | José Valim | 2012-05-30 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add a railtie's changelog entry about runner hook. | |||||
| | * | | | | | | | | Add a changelog entry about runner hook. | kennyj | 2012-05-31 | 1 | -0/+2 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | Merge pull request #6550 from arunagw/warning_removed_assert_match | José Valim | 2012-05-30 | 5 | -33/+33 | |
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | Some of the warnings removed from "railties" | |||||
| | * | | | | | | | Unused variable warning removed. | Arun Agrawal | 2012-05-30 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| | * | | | | | | | More assert_match warnings fixed. | Arun Agrawal | 2012-05-30 | 4 | -12/+12 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Warnings removed for "assert_match /". | Arun Agrawal | 2012-05-30 | 1 | -20/+20 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Merge pull request #5843 from ↵ | José Valim | 2012-05-29 | 2 | -2/+7 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kuroda/translation_of_deeply_nested_model_attributes Fix human attribute_name to handle deeply nested attributes | |||||
| | * | | | | | | | Fix human attribute_name to handle deeply nested attributes | Tsutomu Kuroda | 2012-05-16 | 2 | -2/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a model nests another model that also nests yet another model using accepts_nested_attributes_for method, its Errors object can have an attribute name with "contacts.addresses.street" style. In this case, the dots within the namespace should be substituted with slashes so that we can provide the translation under the "activemodel.attributes.person/contacts/addresses.street" key. This commit is related to #3859. | |||||
| * | | | | | | | | 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. | |||||
| | * | | | | | | | | 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] refactor rakefile to have a :guides namespace and a task that shows help | |||||
| | * | | | | | | | [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 ↵ | Rafael Magana | 2012-05-28 | 3 | -18/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of using KINDLE=1 | |||||
| | * | | | | | | | [guides] get rid of any reference to the generator script since rake tasks ↵ | Rafael Magana | 2012-05-28 | 2 | -6/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are now the new interface | |||||
| | * | | | | | | | [guides] update generator.rb to refer to guides:generate instead of ↵ | Rafael Magana | 2012-05-27 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generate_guides | |||||
| | * | | | | | | | [guides] update guides guidelines with the new generation and validation ↵ | Rafael Magana | 2012-05-27 | 1 | -5/+23 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rake tasks | |||||
| | * | | | | | | | [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 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | (Try again) Fix #5847 and #4045. | |||||
| | * | | | | | | | | 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. | |||||
| | * | | | | | | | | JRuby return different Array for module contents. | Arun Agrawal | 2012-05-29 | 1 | -1/+1 | |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test was failing against JRuby. It loads like [Constant3 Constant1] | |||||
| * | | | | | | | | Merge pull request #6525 from freerange/minitest-passthrough-exceptions | José Valim | 2012-05-29 | 2 | -8/+62 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Exceptions like Interrupt & NoMemoryError should not be rescued in tests. | |||||
| | * | | | | | | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Neither Test::Unit nor MiniTest rescue exceptions like Interrupt or NoMemoryError, but ActiveSupport::Testing::SetupAndTeardown#run which overrides MiniTest::Unit::TestCase#run rescues them. Rescuing an Interrupt exception is annoying, because it means when you are running a lot of tests e.g. when running one of the rake test tasks, you cannot break out using ctrl-C. Rescuing exceptions like NoMemoryError is foolish, because the most sensible thing to happen is for the process to terminate as soon as possible. This solution probably needs some finessing e.g. I'm not clear whether the assumption is that only MiniTest is supported. Also early versions of MiniTest did not have this behaviour. However, hopefully it's a start. Integrating with Test::Unit & MiniTest has always been a pain. It would be great if both of them provided sensible extension points for the kind of things that both Rails and Mocha want to do. | |||||
| * | | | | | | | | | 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 | |||||
| | * | | | | | | | | | update Gemfile template to 1.9 hash syntax | Francesco Rodriguez | 2012-05-29 | 1 | -1/+1 | |
| |/ / / / / / / / / | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |