Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #12090 from njakobsen/merger-performance | Aaron Patterson | 2013-08-30 | 1 | -3/+3 |
|\ | | | | | [Performance] Don't create fibers while merging bind variables | ||||
| * | Don't create fibers just to iterate | Nicholas Jakobsen | 2013-08-30 | 1 | -3/+3 |
| | | |||||
* | | reconnect after the fork returns | Aaron Patterson | 2013-08-30 | 1 | -0/+2 |
| | | |||||
* | | reduce relation allocations | Aaron Patterson | 2013-08-30 | 1 | -1/+3 |
| | | |||||
* | | remove unused variable | Aaron Patterson | 2013-08-30 | 1 | -1/+1 |
| | | |||||
* | | no need to fully qualify | Aaron Patterson | 2013-08-30 | 1 | -1/+1 |
| | | |||||
* | | move the cache to the AR models and populate it on inherited | Aaron Patterson | 2013-08-30 | 3 | -24/+50 |
| | | |||||
* | | add a failing test for marshal + cache problems | Aaron Patterson | 2013-08-30 | 1 | -0/+26 |
| | | |||||
* | | no need for the const_get since we lock | Aaron Patterson | 2013-08-30 | 1 | -5/+1 |
| | | |||||
* | | require a class for cache computations | Aaron Patterson | 2013-08-30 | 2 | -2/+4 |
| | | |||||
* | | cache misses should return self | Aaron Patterson | 2013-08-30 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2013-08-31 | 4 | -12/+18 |
|\ \ | |/ |/| | |||||
| * | Fix typos [ci skip] | Carlos Antonio da Silva | 2013-08-30 | 1 | -2/+2 |
| | | |||||
| * | Add documentation for rake db:setup task | Jay Hayes | 2013-08-29 | 1 | -0/+5 |
| | | |||||
| * | Note functional equivalence in reset task | Jay Hayes | 2013-08-29 | 1 | -2/+2 |
| | | |||||
| * | Fix doc for singularize - `pluralized` => `singularized` | Vipul A M | 2013-08-27 | 1 | -1/+1 |
| | | |||||
| * | Document ability to run a single test. | wangjohn | 2013-08-21 | 1 | -1/+8 |
| | | |||||
| * | Removing merge conflict remnants in the guides. | wangjohn | 2013-08-21 | 1 | -6/+0 |
| | | |||||
| * | Moved "`mod_expires` to be enabled" to new line. | Prathamesh Sonpatki | 2013-08-21 | 1 | -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/master | Santiago Pastorino | 2013-08-30 | 1 | -1/+3 |
|\ \ | | | | | | | FIX reload! within rails console --sandbox causes undefined method rollb... | ||||
| * | | FIX reload! within rails console --sandbox causes undefined method rollback ↵ | Val Kotlarov Hoffman | 2013-08-30 | 1 | -1/+3 |
| | | | | | | | | | | | | upon exiting [https://github.com/rails/rails/issues/11834] | ||||
* | | | add missing fixtures file | Aaron Patterson | 2013-08-30 | 1 | -1/+2 |
|/ / | |||||
* | | Merge pull request #12078 from prathamesh-sonpatki/typo | Guillermo Iguaran | 2013-08-29 | 1 | -1/+1 |
|\ \ | | | | | | | Fix typo in generators test helpr -> helper [ci skip] | ||||
| * | | Fix typo in generators test helpr -> helper [ci skip] | Prathamesh Sonpatki | 2013-08-30 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #12076 from dabit/master | Carlos Antonio da Silva | 2013-08-29 | 3 | -3/+3 |
|\ \ | | | | | | | Fix broken link to Fixtures documentation on guides and activerecord tests [ci skip] | ||||
| * | | Fix broken link to Fixtures documentation on guides | David Padilla | 2013-08-29 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | | | | and activerecord tests [ci skip] | ||||
* | | | Stop messing up with instance variables, use protected as it was meant for | Carlos Antonio da Silva | 2013-08-30 | 1 | -2/+7 |
| | | | |||||
* | | | Remove not necessary AR changelog entry, fix markup [ci skip] | Carlos Antonio da Silva | 2013-08-30 | 1 | -6/+1 |
| | | | |||||
* | | | make sure there are actually some categories when running the test | Aaron Patterson | 2013-08-29 | 1 | -0/+1 |
| | | | |||||
* | | | pk should not be required for hm:t associations | Aaron Patterson | 2013-08-29 | 3 | -1/+15 |
|/ / | |||||
* | | Merge pull request #12062 from strzalek/default-protected-vars | José Valim | 2013-08-29 | 5 | -19/+21 |
|\ \ | | | | | | | Port all remaining self.protected_instance_variables to class methods | ||||
| * | | Port all remaining self.protected_instance_variables to class methods | Łukasz Strzałkowski | 2013-08-29 | 5 | -19/+21 |
| | | | |||||
* | | | Merge pull request #12051 from bcherry/preserve_datetime_milliseconds | Andrew White | 2013-08-28 | 2 | -0/+9 |
|\ \ \ | | | | | | | | | ActiveRecord: Include usecs when quoting DateTime in PostgreSQL adapter | ||||
| * | | | Test that PostgreSQL adapter includes `usec` when quoting `DateTime` | Ben Cherry | 2013-08-28 | 2 | -0/+9 |
| | | | | |||||
* | | | | Merge branch 'typecast' | Aaron Patterson | 2013-08-28 | 2 | -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 allocations | Aaron Patterson | 2013-08-28 | 2 | -7/+11 |
| | | | | | |||||
| * | | | | no need to to_a the scope | Aaron Patterson | 2013-08-28 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | remove extra flat_map array | Aaron Patterson | 2013-08-28 | 1 | -8/+9 |
| | | | | | |||||
| * | | | | avoid extra empty array allocation | Aaron Patterson | 2013-08-28 | 1 | -10/+10 |
| | | | | | |||||
| * | | | | extract owner id calculation to a method | Aaron Patterson | 2013-08-28 | 1 | -1/+5 |
| | | | | | |||||
| * | | | | only call to_a when we have to | Aaron Patterson | 2013-08-28 | 2 | -2/+6 |
| | | | | | |||||
* | | | | | Merge pull request #12061 from wangjohn/refactoring_generators_base | Rafael Mendonça França | 2013-08-28 | 1 | -14/+17 |
|\ \ \ \ \ | | | | | | | | | | | | | Refactoring Generators::Base. | ||||
| * | | | | | Refactoring Generators::Base. | wangjohn | 2013-08-28 | 1 | -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-doc | Rafael Mendonça França | 2013-08-28 | 1 | -1/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Add nodoc to ActiveModel::SecurePassword.min_cost | ||||
| * | | | | | Add :nodoc: to ActiveModel::SecurePassword.min_cost | Gaurish Sharma | 2013-08-29 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | | Merge pull request #12053 from schuetzm/doc_sqlite3_mem | Yves Senn | 2013-08-28 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | | | | | Mention the fast `test_sqlite3_mem` option in `RUNNING_UNIT_TESTS.rdoc` [ci skip] | ||||
| * | | | | | Mention the fast `test_sqlite3_mem` option in `RUNNING_UNIT_TESTS.rdoc` [ci ↵ | Marc Schütz | 2013-08-28 | 1 | -0/+1 |
|/ / / / / | | | | | | | | | | | | | | | | skip] | ||||
* | | | | | Merge pull request #12033 from alexaltair/patch-1 | Yves Senn | 2013-08-27 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | change reference of `Test::Unit` to `Minitest` [ci skip] | ||||
| * | | | | Update Test::Unit to Minitest | Alex Altair | 2013-08-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous was misleading; current is more up to date. [ci skip] | ||||
* | | | | | use consistent keys between cache get / set | Aaron Patterson | 2013-08-27 | 1 | -1/+1 |
| | | | | |