aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #10220 from vipulnsward/interpolate_on_stringRafael Mendonça França2013-04-151-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | interpolate instead of string concat
| * | | | | | interpolate instead of string concatVipul A M2013-04-151-1/+1
|/ / / / / /
* | | | | | Merge pull request #10212 from mariovisic/active_record_docCarlos Antonio da Silva2013-04-151-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add documentation for `collection.create!` on has_many records. [ci skip]
| * | | | | Document collection.create! on has_many associations in ActiveRecordMario Visic2013-04-151-0/+4
|/ / / / /
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-04-136-14/+14
|\ \ \ \ \
| * | | | | Corrected paramter to parameterCarson McDonald2013-04-131-1/+1
| | | | | |
| * | | | | fix :nodoc: mark on AR::AttributeMethods::Serialization [ci skip]Francesco Rodriguez2013-04-121-2/+2
| | | | | |
| * | | | | Fix a typoViktar Basharymau2013-04-121-1/+1
| | | | | |
| * | | | | Update to Ryan's new book per his suggestionJonathan Roes2013-04-121-1/+1
| | | | | | | | | | | | | | | | | | See https://github.com/lifo/docrails/commit/edeb98c2745cbf29725eca87332cefb4f273986a#commitcomment-2995521
| * | | | | minor edit on StatementCache documentation [ci skip]Francesco Rodriguez2013-04-121-1/+1
| | | | | |
| * | | | | Fix links containing stray colonsBenjamin Tan Wei Hao2013-04-121-4/+4
| | | | | |
| * | | | | Fix StatementCache docs format [ci skip]Francesco Rodriguez2013-04-111-5/+5
| | | | | |
* | | | | | Merge pull request #10207 from epiclabs/use_define_singleton_methodXavier Noria2013-04-131-4/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | use define_singleton_method instead of class_eval
| * | | | | | use define_singleton_method instead of class_evalFrancesco Rodriguez2013-04-131-4/+2
|/ / / / / /
* | | | | | Merge pull request #10206 from epiclabs/nodoc_for_missing_methodXavier Noria2013-04-131-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add :nodoc: mark to PerThreadRegistry#method_missing [ci skip]
| * | | | | | Add :nodoc: mark to PerThreadRegistry#method_missing [ci skip]Francesco Rodriguez2013-04-131-1/+1
|/ / / / / /
* | | | | | Merge pull request #10204 from shmatov/update-git-linksGuillermo Iguaran2013-04-132-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update github links
| * | | | | | update git linksRoman Shmatov2013-04-132-3/+3
|/ / / / / /
* | | | | | hides the per thread registry instance, and caches singleton methodsXavier Noria2013-04-134-30/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Existing code was delegating to the instance with delegate macro calls, or invoking the instance method to reach the object and call its instance methods. But the point is to have a clean class-level interface where the thread local instance is hidden in the implementation. References #11c6973. References #10198.
* | | | | | Merge pull request #10201 from vipulnsward/remove_unused_var_in_guidesCarlos Antonio da Silva2013-04-131-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | remove unused variable
| * | | | | | remove unused variableVipul A M2013-04-131-1/+1
| | | | | | |
* | | | | | | removes calls to AR::Runtime.instanceXavier Noria2013-04-133-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Registries have class-level accessors to write clean code, let's use them. This makes style uniform also with existing usage in ScopeRegistry and InstrumentationRegistry. If performance of the method_missing callback was ever considered to be a concern, then we should stop using it altogether and probably remove the callback. But while we have the feature we should use it.
* | | | | | | simplifies the RDoc of AR::RuntimeRegistryXavier Noria2013-04-131-20/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous version was kind of duplicating the documentation of AS::PerThreadRegistry. Just say how to use it, the thread locals registry is know part of our vocabulary (though a pointer to Active Support is added for reference).
* | | | | | | complete rewrite of the documentation of AS::PerThreadRegistryXavier Noria2013-04-132-22/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * It focuses on how to use it. * Removes some ambigueties in the original docs about whether the state is stored in the class. * Documents it provides class-level accessors via method_missing. * Documents that if the extended class has an initializer, it must accept no arguments.
* | | | | | | Revert "Merge pull request #10194 from ↵Carlos Antonio da Silva2013-04-121-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pabloh/extract_regexp_at_generators_testing_assertion" This reverts commit 81f243375b9d3cfd431c1ca904c5c1efc9a41ae8, reversing changes made to c7673b0981d961e5510c85d958c944876d543314.
* | | | | | | Merge pull request #10194 from ↵Carlos Antonio da Silva2013-04-121-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pabloh/extract_regexp_at_generators_testing_assertion Extract method declaration regexp for assert_method into a constant
| * | | | | | | Extract method declaration regexp into a constantPablo Herrero2013-04-121-1/+3
| | | | | | | |
* | | | | | | | Merge pull request #10195 from jetthoughts/eager_load_on_rake_execution_testsJosé Valim2013-04-121-0/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Added tests for `eager_load` config option rake tasks
| * | | | | | | | Added tests for `eager_load` config option to do not eager load for rake ↵Paul Nikitochkin2013-04-121-0/+17
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | tasks if `eager_load` is `true`
* | | | | | | | Merge pull request #10192 from senny/align_expression_outputsCarlos Antonio da Silva2013-04-121-7/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | align the result of expressions vertically [ci skip].
| * | | | | | | | align the result of expressions vertically [ci skip].Yves Senn2013-04-121-7/+7
| | | | | | | | |
* | | | | | | | | Merge pull request #9639 from BanzaiMan/chatham_islands_timeGuillermo Iguaran2013-04-121-1/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Add Chatham Islands Time (UTC+1245) support.
| * | | | | | | | Add Chatham Islands Time (UTC+1245) support.Hiro Asari2013-04-121-1/+2
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Also update the documentation on the number of supported time zones.
* | | | | | | | Merge pull request #10190 from senny/changelog_cleanupCarlos Antonio da Silva2013-04-125-22/+25
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Use unified and clean formatting in CHANGELOGS. [ci skip]
| * | | | | | | use unified and clean formatting in CHANGELOGS. [ci skip]Yves Senn2013-04-125-22/+25
|/ / / / / / /
* | | | | | | replaces Pathname#(dirname|realpath) with File.$1Xavier Noria2013-04-121-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Simpler, thanks to @rubys for the hint.
* | | | | | | Merge pull request #10179 from vipulnsward/refactor_order_hash_testSantiago Pastorino2013-04-111-5/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | refactor order hash test; remove unused method param
| * | | | | | refactor order hash testVipul A M2013-04-111-5/+1
| | | | | | |
* | | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-04-1169-289/+421
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/action_mailer_basics.md
| * | | | | | | add wip for the action view guide [ci skip]Vijay Dev2013-04-111-0/+1
| | | | | | | |
| * | | | | | | Merge pull request #136 from bricestacey/masterFrancesco Rodríguez2013-04-111-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Unabbreviate AP to ActionPack [ci skip]
| | * | | | | | | Unabbreviate AP to ActionPackBrice Stacey2013-04-101-1/+1
| |/ / / / / / /
| * | | | | | | Updated Singular Resource shorthand to mention shorthand without controller ↵Oliver Jakubiec2013-04-101-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name.
| * | | | | | | improve accuracy of simple_format documentation. span doesn't get sanitized.RSL2013-04-091-2/+5
| | | | | | | |
| * | | | | | | Merge pull request #135 from dalton/masterdalton2013-04-091-13/+13
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Change user_class to author_class in Engine guide
| | * | | | | | | User is not part of the Blorgh domain, so user_class doesn't make sense. ↵Adam Dalton2013-04-081-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit changes it to author_class.
| * | | | | | | | JoinPart is no longer an abstract classNeeraj Singh2013-04-081-1/+1
| |/ / / / / / /
| * | | | | | | Merge pull request #134 from igas/masterIgor Kapkov2013-04-081-8/+9
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add missing PATCH in Getting Started Guide
| | * | | | | | | Getting Started Guide: add missing PATCHIgor Kapkov2013-04-071-8/+9
| | | | | | | | |
| * | | | | | | | Here was a 404 error: Active Record ValidationsZoltan Debre2013-04-071-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | Active Record Validations and Callbacks's URL and name is changed.