aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #10379 from frodsan/fix_nodoc_ar_delegationGuillermo Iguaran2013-04-291-3/+3
|\
| * add missing :nodoc: marks to ActiveRecord::Delegation [ci skip]Francesco Rodriguez2013-04-291-3/+3
|/
* Merge pull request #10378 from frodsan/fix_precompiling_assets_sectionRafael Mendonça França2013-04-291-1/+1
|\
| * Fix guide section about assets precompiling task in production [ci skip]Francesco Rodriguez2013-04-291-1/+1
|/
* Merge pull request #9791 from wangjohn/remove_configurableRafael Mendonça França2013-04-295-21/+45
|\
| * Removing Railtie::Configurable from the base Railtie object and makingwangjohn2013-04-295-21/+45
|/
* rails/master is now 4.1.0.betaRafael Mendonça França2013-04-2914-4410/+22
* Bump version to rc1David Heinemeier Hansson2013-04-298-8/+8
* Bump activerecord-deprecated_finders. Fixes #10304Rafael Mendonça França2013-04-291-1/+1
* Merge pull request #10372 from jeremy/statement-invalid-wraps-underlying-exce...Jeremy Kemper2013-04-283-12/+13
|\
| * StatementInvalid takes WrappedDatabaseException's placeJeremy Kemper2013-04-283-12/+13
* | Delegate #unscope query methodCarlos Antonio da Silva2013-04-282-1/+11
|/
* Merge pull request #10364 from wangjohn/refactoring_activesupport_cacheJeremy Kemper2013-04-281-10/+23
|\
| * Making the retrieval of the cache store class a method, also wrotewangjohn2013-04-281-10/+23
* | Merge pull request #10361 from teeparham/patch-1Carlos Antonio da Silva2013-04-281-1/+1
|\ \
| * | fix travis links in readmeTee Parham2013-04-261-1/+1
* | | Merge pull request #10368 from demands/fix-typoGuillermo Iguaran2013-04-281-1/+1
|\ \ \
| * | | Fix typo in serialized_attribute_test. [ci skip]Max Edmands2013-04-281-1/+1
* | | | Use new hash syntax in module delegation docs [ci skip]Carlos Antonio da Silva2013-04-281-1/+1
| |_|/ |/| |
* | | fixes a test, and explains why AR::AttributeMethods checks defined?(@attribut...Xavier Noria2013-04-283-6/+8
* | | pass over the code commentsXavier Noria2013-04-281-28/+32
|/ /
* | Don't reprocess the options hash on every requestAndrew White2013-04-271-1/+2
* | adding test for the symbol refsAaron Patterson2013-04-261-0/+7
* | Module#delegate checks nilness rather that falsehood if :allow_nil is true, a...Xavier Noria2013-04-262-30/+73
|/
* Merge pull request #9980 from stouset/patch-1Andrew White2013-04-261-4/+5
|\
| * Improve poor security recommendation in docsStephen Touset2013-03-281-4/+5
* | Merge pull request #10351 from JonRowe/update_as_date_next_week_to_document_i...Xavier Noria2013-04-262-5/+10
|\ \
| * | formattingJon Rowe2013-04-261-1/+1
| * | better document `next_week` functionaility closes #9568Jon Rowe2013-04-262-5/+10
* | | Merge pull request #10347 from lellisga/delegation_bug_documentationGuillermo Iguaran2013-04-252-0/+19
|\ \ \ | |/ / |/| |
| * | Delegation method bugLi Ellis Gallardo2013-04-252-0/+19
* | | ActiveRecord -> Active RecordXavier Noria2013-04-251-1/+1
* | | fixes warning in the AR test suiteXavier Noria2013-04-251-1/+1
|/ /
* | Revert "Merge pull request #10337 from eimermusic/fix_template_digestor_lookup"Rafael Mendonça França2013-04-253-11/+2
* | Merge pull request #10337 from eimermusic/fix_template_digestor_lookupRafael Mendonça França2013-04-253-2/+11
|\ \
| * | AV Digestor correctly passes format to LookupContextMartin Westin2013-04-253-2/+11
* | | Add support for extra options to `force_ssl`Andrew White2013-04-253-31/+159
* | | Use `request.fullpath` to build redirect url in `force_ssl`Andrew White2013-04-253-4/+79
|/ /
* | Review DatabaseTasks docs [ci skip]Carlos Antonio da Silva2013-04-241-17/+17
* | Merge pull request #10333 from ikataitsev/move-test-method-to-testsRafael Mendonça França2013-04-242-8/+9
|\ \
| * | Move method used only in the test to the test code itselfIvan Kataitsev2013-04-252-8/+9
* | | Minor AR changelog review [ci skip]Carlos Antonio da Silva2013-04-241-6/+8
|/ /
* | Merge pull request #10332 from vipulnsward/number_helperRafael Mendonça França2013-04-241-2/+3
|\ \
| * | refactor number helperVipul A M2013-04-251-2/+3
* | | Merge branch 'active-record-standalone-improvements'Piotr Sarnacki2013-04-244-24/+92
|\ \ \
| * | | Use env == 'development' instead of env.development?Piotr Sarnacki2013-04-241-1/+1
| * | | Move CHANGELOG entry for db.rake improvements to 4.0.0Piotr Sarnacki2013-04-241-3/+1
| * | | Don't require Rails.env in order to use AR::Tasks::DatabaseTasksPiotr Sarnacki2013-04-242-6/+8
| * | | Add some documentation to ActiveRecord::Tasks::DatabaseTasksPiotr Sarnacki2013-04-241-1/+29
| * | | Use DatabaseTasks.fixtures_path instead of FIXTURES_PATH in db.rakePiotr Sarnacki2013-04-243-3/+22