aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12095 from kassio/upgrade-jruby-gemsRafael Mendonça França2013-08-311-6/+6
|\ | | | | Upgrade jruby dependencies
| * upgrade jruby dependenciesKassio Borges2013-08-311-6/+6
|/
* Merge pull request #12091 from rywall/pluck-optimizationJosé Valim2013-08-311-2/+1
|\ | | | | [Perf] Don't use Enumerable#next in pluck since it is very slow
| * Don't use Enumerable#next in pluck since it is very slowRyan Wallace2013-08-301-2/+1
| |
* | Merge pull request #12093 from wangjohn/indentation_in_generatorJosé Valim2013-08-311-3/+3
|\ \ | |/ |/| Using indent method to refactor controller generator.
| * Using indent method to refactor controller generator.wangjohn2013-08-311-3/+3
|/ | | | [John J. Wang & Prathamesh Sonpatki]
* Merge pull request #12090 from njakobsen/merger-performanceAaron Patterson2013-08-301-3/+3
|\ | | | | [Performance] Don't create fibers while merging bind variables
| * Don't create fibers just to iterateNicholas Jakobsen2013-08-301-3/+3
| |
* | reconnect after the fork returnsAaron Patterson2013-08-301-0/+2
| |
* | reduce relation allocationsAaron Patterson2013-08-301-1/+3
| |
* | remove unused variableAaron Patterson2013-08-301-1/+1
| |
* | no need to fully qualifyAaron Patterson2013-08-301-1/+1
| |
* | move the cache to the AR models and populate it on inheritedAaron Patterson2013-08-303-24/+50
| |
* | add a failing test for marshal + cache problemsAaron Patterson2013-08-301-0/+26
| |
* | no need for the const_get since we lockAaron Patterson2013-08-301-5/+1
| |
* | require a class for cache computationsAaron Patterson2013-08-302-2/+4
| |
* | cache misses should return selfAaron Patterson2013-08-301-1/+1
| |
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-08-314-12/+18
|\ \ | |/ |/|
| * Fix typos [ci skip]Carlos Antonio da Silva2013-08-301-2/+2
| |
| * Add documentation for rake db:setup taskJay Hayes2013-08-291-0/+5
| |
| * Note functional equivalence in reset taskJay Hayes2013-08-291-2/+2
| |
| * Fix doc for singularize - `pluralized` => `singularized`Vipul A M2013-08-271-1/+1
| |
| * Document ability to run a single test.wangjohn2013-08-211-1/+8
| |
| * Removing merge conflict remnants in the guides.wangjohn2013-08-211-6/+0
| |
| * Moved "`mod_expires` to be enabled" to new line.Prathamesh Sonpatki2013-08-211-2/+2
| | | | | | | | | | | | | | | | | | | | - Right now the comment was not rendering properly. # The Expires* directives requires the Apache module `mod_expires` to be # enabled. - After this change - # The Expires* directives requires the Apache module # `mod_expires` to be enabled.
* | Merge pull request #12085 from valk/masterSantiago Pastorino2013-08-301-1/+3
|\ \ | | | | | | FIX reload! within rails console --sandbox causes undefined method rollb...
| * | FIX reload! within rails console --sandbox causes undefined method rollback ↵Val Kotlarov Hoffman2013-08-301-1/+3
| | | | | | | | | | | | upon exiting [https://github.com/rails/rails/issues/11834]
* | | add missing fixtures fileAaron Patterson2013-08-301-1/+2
|/ /
* | Merge pull request #12078 from prathamesh-sonpatki/typoGuillermo Iguaran2013-08-291-1/+1
|\ \ | | | | | | Fix typo in generators test helpr -> helper [ci skip]
| * | Fix typo in generators test helpr -> helper [ci skip]Prathamesh Sonpatki2013-08-301-1/+1
|/ /
* | Merge pull request #12076 from dabit/masterCarlos Antonio da Silva2013-08-293-3/+3
|\ \ | | | | | | Fix broken link to Fixtures documentation on guides and activerecord tests [ci skip]
| * | Fix broken link to Fixtures documentation on guidesDavid Padilla2013-08-293-3/+3
| | | | | | | | | | | | | | | | | | and activerecord tests [ci skip]
* | | Stop messing up with instance variables, use protected as it was meant forCarlos Antonio da Silva2013-08-301-2/+7
| | |
* | | Remove not necessary AR changelog entry, fix markup [ci skip]Carlos Antonio da Silva2013-08-301-6/+1
| | |
* | | make sure there are actually some categories when running the testAaron Patterson2013-08-291-0/+1
| | |
* | | pk should not be required for hm:t associationsAaron Patterson2013-08-293-1/+15
|/ /
* | Merge pull request #12062 from strzalek/default-protected-varsJosé Valim2013-08-295-19/+21
|\ \ | | | | | | Port all remaining self.protected_instance_variables to class methods
| * | Port all remaining self.protected_instance_variables to class methodsŁukasz Strzałkowski2013-08-295-19/+21
| | |
* | | Merge pull request #12051 from bcherry/preserve_datetime_millisecondsAndrew White2013-08-282-0/+9
|\ \ \ | | | | | | | | ActiveRecord: Include usecs when quoting DateTime in PostgreSQL adapter
| * | | Test that PostgreSQL adapter includes `usec` when quoting `DateTime`Ben Cherry2013-08-282-0/+9
| | | |
* | | | Merge branch 'typecast'Aaron Patterson2013-08-282-18/+31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * typecast: correctly typecast keys, remove conditionals, reduce object allocations no need to to_a the scope remove extra flat_map array avoid extra empty array allocation extract owner id calculation to a method only call to_a when we have to
| * | | | correctly typecast keys, remove conditionals, reduce object allocationsAaron Patterson2013-08-282-7/+11
| | | | |
| * | | | no need to to_a the scopeAaron Patterson2013-08-281-1/+1
| | | | |
| * | | | remove extra flat_map arrayAaron Patterson2013-08-281-8/+9
| | | | |
| * | | | avoid extra empty array allocationAaron Patterson2013-08-281-10/+10
| | | | |
| * | | | extract owner id calculation to a methodAaron Patterson2013-08-281-1/+5
| | | | |
| * | | | only call to_a when we have toAaron Patterson2013-08-282-2/+6
| | | | |
* | | | | Merge pull request #12061 from wangjohn/refactoring_generators_baseRafael Mendonça França2013-08-281-14/+17
|\ \ \ \ \ | | | | | | | | | | | | Refactoring Generators::Base.
| * | | | | Refactoring Generators::Base.wangjohn2013-08-281-14/+17
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The defaults hash isn't used unless the +class_options+ hash has a particular key, so we don't need to compute it unless this is true. Also moving some code for extracting a module into its own method.
* | | | | Merge pull request #12058 from gaurish/secure-pass-docRafael Mendonça França2013-08-281-1/+3
|\ \ \ \ \ | | | | | | | | | | | | Add nodoc to ActiveModel::SecurePassword.min_cost
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-16 15:00:08 +0000