aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | Merge pull request #102 from xenda/masterXenda2012-05-271-4/+4
| | |\ \ \ \ \
| | * | | | | | add :locale option to Array#to_sentence documentation [ci skip]Francesco Rodriguez2012-05-281-0/+27
| | * | | | | | add examples to Array#to_sentence [ci skip]Francesco Rodriguez2012-05-281-4/+24
| | * | | | | | update documentation of array/access methods [ci skip]Francesco Rodriguez2012-05-281-8/+16
| | * | | | | | [security guide] use info, note and warning where applicableRafael Magana2012-05-281-34/+34
| | * | | | | | Merge pull request #101 from lazylester/masterFrancesco Rodríguez2012-05-271-0/+6
| | |\ \ \ \ \ \
| | | * | | | | | add small note about how to get the full list of options for rails plugin newLes Nightingill2012-05-261-0/+6
| | * | | | | | | "a sql" -> "an SQL" per API documentation guidelinesMark Rushakoff2012-05-272-2/+2
| | * | | | | | | some asset path changes and formatting fixes in AV overview [ci skip]Vijay Dev2012-05-271-12/+10
| * | | | | | | | Adds examples to FinderMethods#first [ci skip]Alvaro Pereyra2012-05-281-0/+1
| * | | | | | | | Updates documentation with cleaner examples and texts [ci skip]Alvaro Pereyra2012-05-282-1/+15
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Updates validations examples to be more attuned on the new Rails 3.0 conventionsAlvaro Pereyra2012-05-281-4/+4
* | | | | | | | Merge pull request #6551 from kennyj/add_entry_20120531José Valim2012-05-301-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Add a changelog entry about runner hook.kennyj2012-05-311-0/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #6550 from arunagw/warning_removed_assert_matchJosé Valim2012-05-305-33/+33
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Unused variable warning removed.Arun Agrawal2012-05-301-1/+1
| * | | | | | | More assert_match warnings fixed.Arun Agrawal2012-05-304-12/+12
| * | | | | | | Warnings removed for "assert_match /".Arun Agrawal2012-05-301-20/+20
|/ / / / / / /
* | | | | | | Merge pull request #5843 from kuroda/translation_of_deeply_nested_model_attri...José Valim2012-05-292-2/+7
|\ \ \ \ \ \ \
| * | | | | | | Fix human attribute_name to handle deeply nested attributesTsutomu Kuroda2012-05-162-2/+7
* | | | | | | | Merge pull request #6546 from erichmenge/patch-as-jsonJeremy Kemper2012-05-292-9/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | True, False, and Nil should be represented in as_json as themselves.Erich Menge2012-05-292-9/+15
|/ / / / / / / /
* | | | | | | | Merge pull request #6502 from rafmagana/guides_refactor_rakefileXavier Noria2012-05-293-22/+89
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | [guides] fix reference to railties directory, guides are no longer thereRafael Magana2012-05-281-1/+1
| * | | | | | | [guides] guides:generate:kindle is the new interface to generate .mobi file i...Rafael Magana2012-05-283-18/+3
| * | | | | | | [guides] get rid of any reference to the generator script since rake tasks ar...Rafael Magana2012-05-282-6/+4
| * | | | | | | [guides] update generator.rb to refer to guides:generate instead of generate_...Rafael Magana2012-05-271-1/+1
| * | | | | | | [guides] update guides guidelines with the new generation and validation rake...Rafael Magana2012-05-271-5/+23
| * | | | | | | [guides] Add rake task to show help and make it the default oneRafael Magana2012-05-261-0/+50
| * | | | | | | [guides] Add :guides namespace and :html and :kindle tasks to RakefileRafael Magana2012-05-261-9/+25
* | | | | | | | copy edits the upgrading guideXavier Noria2012-05-291-9/+9
* | | | | | | | Merge pull request #6518 from kennyj/fix_5847-4José Valim2012-05-2911-2/+83
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix #5847 and #4045 on master.kennyj2012-05-301-0/+2
| * | | | | | | | Use runner hook to load ActiveRecord::Base.kennyj2012-05-301-0/+4
| * | | | | | | | Add support runner hook.kennyj2012-05-296-0/+53
| * | | | | | | | SchemaMigration should be loaded lazily.kennyj2012-05-293-2/+1
| * | | | | | | | Add a testcase for #5847.kennyj2012-05-291-0/+23
|/ / / / / / / /
* | | | | | | | Merge pull request #6535 from arunagw/jruby_module_testCarlos Antonio da Silva2012-05-291-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | JRuby return different Array for module contents.Arun Agrawal2012-05-291-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #6525 from freerange/minitest-passthrough-exceptionsJosé Valim2012-05-292-8/+62
|\ \ \ \ \ \ \ \
| * | | | | | | | Avoid dependency on MiniTest::Unit::TestCase::PASSTHROUGH_EXCEPTIONS.James Mead2012-05-291-2/+10
| * | | | | | | | Exceptions like Interrupt should not be rescued.James Mead2012-05-282-8/+54
* | | | | | | | | Merge pull request #6528 from frodsan/update_hash_syntax_gemfile_templateJosé Valim2012-05-291-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | update Gemfile template to 1.9 hash syntaxFrancesco Rodriguez2012-05-291-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #6526 from appfolio/decoupling_activesupport_from_actionivewCarlos Antonio da Silva2012-05-282-4/+44
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | decoupling activesupport performance testing from actionview and adding testsAndrew Mutz2012-05-282-4/+44
|/ / / / / / / / /
* | | | | | | | | Merge pull request #6527 from frodsan/add_test_to_delete_by_fixnum_or_stringCarlos Antonio da Silva2012-05-281-0/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add tests to delete by fixnum or string id with has many through associationsFrancesco Rodriguez2012-05-281-0/+20
|/ / / / / / / / /
* | | | | | | | | Add note about CollectionAssociation#delete change to upgrading guide [ci skip]Carlos Antonio da Silva2012-05-291-0/+4
* | | | | | | | | Fix failing build related to change in CollectionAssociation#deleteCarlos Antonio da Silva2012-05-291-1/+1