aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Perf: micro optimised Result column hash_row creationSam2013-08-291-1/+15
* Merge branch 'typecast'Aaron Patterson2013-08-282-18/+31
|\
| * 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.wangjohn2013-08-281-14/+17
|/ /
* | Merge pull request #12058 from gaurish/secure-pass-docRafael Mendonça França2013-08-281-1/+3
|\ \
| * | Add :nodoc: to ActiveModel::SecurePassword.min_costGaurish Sharma2013-08-291-1/+3
* | | Merge pull request #12053 from schuetzm/doc_sqlite3_memYves Senn2013-08-281-0/+1
|\| |
| * | Mention the fast `test_sqlite3_mem` option in `RUNNING_UNIT_TESTS.rdoc` [ci s...Marc Schütz2013-08-281-0/+1
|/ /
* | Merge pull request #12033 from alexaltair/patch-1Yves Senn2013-08-271-1/+1
|\ \ | |/ |/|
| * Update Test::Unit to MinitestAlex Altair2013-08-271-1/+1
* | use consistent keys between cache get / setAaron Patterson2013-08-271-1/+1
* | remove intermediate variableAaron Patterson2013-08-271-3/+1
* | cache association reset calculationAaron Patterson2013-08-271-4/+4
* | query the association rather than send the method for the association nameAaron Patterson2013-08-272-11/+10
* | Merge pull request #12048 from tjouan/app_generator-bin_perms-umaskAaron Patterson2013-08-271-1/+1
|\ \
| * | Comply with current umask when generating new app:Thibault Jouan2013-08-271-1/+1
|/ /
* | Improve CHANGELOG entry [ci skip]Rafael Mendonça França2013-08-271-4/+2
* | Merge pull request #11768 from cloudspace/cache_template_loadingRafael Mendonça França2013-08-273-5/+24
|\ \
| * | Only cache template digests if config.cache_template_loadingJosh Lauer2013-08-063-5/+24
* | | Merge pull request #11805 from jetthoughts/11803_update_move_forbidden_except...Rafael Mendonça França2013-08-271-34/+36
|\ \ \
| * | | #11803: Move Forbidden attributes description before show post sectionPaul Nikitochkin2013-08-271-34/+36
* | | | Remove gist link from the codeRafael Mendonça França2013-08-271-1/+0
* | | | Merge pull request #11945 from Mik-die/polymorphic-decoratorRafael Mendonça França2013-08-273-1/+32
|\ \ \ \
| * | | | check class hierarchy with is_a? in PredicateBuilder.expandMikhail Dieterle2013-08-273-1/+32
| |/ / /
* | | | Fix misspelling on README.mdPrem Sichanugrist2013-08-271-1/+1
* | | | Merge pull request #12028 from egilburg/patch-1Rafael Mendonça França2013-08-271-15/+20
|\ \ \ \
| * | | | Updating README.md [ci skip]Eugene Gilburg2013-08-261-15/+20
* | | | | Merge pull request #12030 from garysweaver/masterYves Senn2013-08-271-0/+6
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | adding more finder migration information to upgrade guide [ci skip]Gary S. Weaver2013-08-271-0/+6
|/ / / /
* | | | Merge pull request #11636 from urbanautomaton/uppercase-nested-const-autoload...Xavier Noria2013-08-274-1/+18
|\ \ \ \
| * | | | Ensure all-caps nested consts marked as autoloadedSimon Coffey2013-08-274-1/+18
|/ / / /
* | | | Improve AP changelog regarding AV extraction [ci skip]Carlos Antonio da Silva2013-08-261-2/+2
* | | | Merge pull request #12038 from SamSaffron/memoize_decorate_colsRafael Mendonça França2013-08-261-17/+27
|\ \ \ \
| * | | | Perf: memoize serialized column list and time zone column listSam2013-08-271-17/+27
* | | | | Merge pull request #12037 from SamSaffron/mem_allocAaron Patterson2013-08-262-3/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Perf: avoid array allocation where not neededSam2013-08-271-1/+1
| * | | | Perf: fields in pg gem causes an allocation, cache itSam2013-08-271-2/+3
|/ / / /
* | | | Merge pull request #12034 from wangjohn/fixtures_config_changesSantiago Pastorino2013-08-262-24/+27
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add config to method calls in fixtures.wangjohn2013-08-262-24/+27
| |/ /
* | | Merge pull request #12032 from carolinemota/fixdocCarlos Antonio da Silva2013-08-261-19/+3
|\ \ \
| * | | Remove whiny_nils config from the rails guidesCaroline Mota2013-08-261-19/+3
* | | | Merge pull request #11986 from fedesoria/patch-3Xavier Noria2013-08-261-0/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Warning on doc for assets under lib|vendor not precompilingFederico Soria2013-08-261-0/+5
* | | | Add note about features vs. bugs.Steve Klabnik2013-08-261-3/+22