Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [Fixes #11512] improves cache size calculation in ↵ | Simeon Simeonov | 2013-07-22 | 3 | -5/+53 |
| | | | | | | | | | | | | | | | | | | | | | ActiveSupport::Cache::MemoryStore Previously, the cache size of `ActiveSupport::Cache::MemoryStore` was calculated as the sum of the size of its entries, ignoring the size of keys and any data structure overhead. This could lead to the calculated cache size sometimes being 10-100x smaller than the memory used, e.g., in the case of small values. The size of a key/entry pair is now calculated via `#cached_size`: def cached_size(key, entry) key.to_s.bytesize + entry.size + PER_ENTRY_OVERHEAD end The value of `PER_ENTRY_OVERHEAD` is 240 bytes based on an [empirical estimation](https://gist.github.com/ssimeonov/6047200) for 64-bit MRI on 1.9.3 and 2.0. Fixes GH#11512 https://github.com/rails/rails/issues/11512 | ||||
* | Merge pull request #11508 from vipulnsward/extract_constants | Yves Senn | 2013-07-20 | 1 | -2/+2 |
|\ | | | | | Extract verbs array from helper to a contant | ||||
| * | Extract verbs array from helper to a constant | Vipul A M | 2013-07-20 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #11507 from vipulnsward/av_typo-4 | Guillermo Iguaran | 2013-07-19 | 1 | -2/+2 |
|\ \ | |/ |/| | Fix test name typos | ||||
| * | Fix test name typos | Vipul A M | 2013-07-19 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #11501 from nishantmodak/patch-3 | Yves Senn | 2013-07-19 | 1 | -0/+2 |
|\ | | | | | Upgrade guide. Renaming Indexes on tables. [ci skip] | ||||
| * | Upgrade guide. Renaming Indexes on tables. [ci skip]. | Nishant Modak | 2013-07-19 | 1 | -0/+2 |
|/ | | | | https://github.com/rails/rails/commit/39eef1a565ef02e4dabc0811ef1bf4547ff9a60e#commitcomment-3672522 | ||||
* | fix typo in Active Record Validations guide. [ci skip]. | Yves Senn | 2013-07-19 | 1 | -1/+1 |
| | | | | Closes #11498. | ||||
* | use the superclass implementation | Aaron Patterson | 2013-07-18 | 2 | -2/+4 |
| | |||||
* | Merge pull request #11492 from maratvmk/concern_test | Yves Senn | 2013-07-18 | 1 | -6/+0 |
|\ | | | | | remove duplication in concern_test | ||||
| * | remove duplication in test | Marat Kazbekov | 2013-07-18 | 1 | -6/+0 |
| | | |||||
* | | Merge pull request #11491 from erichkist/ek-revert-unscope-patch | Rafael Mendonça França | 2013-07-18 | 1 | -1/+1 |
|\ \ | |/ |/| | Revert "Fix SyntaxError in guides sample code" | ||||
| * | Revert "Fix SyntaxError in guides sample code" | Erich Kist | 2013-07-18 | 1 | -1/+1 |
|/ | | | | | | | | This reverts commit f573df32d43c413a5098721ba6151ff190c23c6c. The original idea of this documentation was to showcase the feature where you can remove some only queries attributes with a single key-value pair. | ||||
* | Use the canonical router on the CHANGELOG entry | Rafael Mendonça França | 2013-07-18 | 1 | -1/+1 |
| | | | | | | Thanks @egilburg [ci skip] | ||||
* | Fix examples of number_to_percentage | Rafael Mendonça França | 2013-07-18 | 1 | -8/+8 |
| | | | | [ci skip] | ||||
* | Merge pull request #11483 from garysweaver/grammar_fix_in_upgrade_documentation | Santiago Pastorino | 2013-07-17 | 1 | -1/+1 |
|\ | | | | | grammar fix in upgrade documentation | ||||
| * | grammar fix in upgrade documentation | Gary S. Weaver | 2013-07-17 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #11485 from simi/mysql2 | Guillermo Iguaran | 2013-07-17 | 1 | -3/+1 |
|\ \ | | | | | | | Use latest mysql2. | ||||
| * | | Use latest mysql2. | Josef Šimánek | 2013-07-18 | 1 | -3/+1 |
|/ / | | | | | | | Fixes #11457 | ||||
* | | Merge pull request #11465 from arunagw/removed_missleading_readme_link_doc | Xavier Noria | 2013-07-17 | 1 | -1/+1 |
|\ \ | |/ |/| | Fixed README link in API | ||||
| * | Fixed README link in API [ci skip] | Arun Agrawal | 2013-07-17 | 1 | -1/+1 |
| | | | | | | | | This should not be a link because it's creating a link with activesupport README right now | ||||
* | | Merge pull request #11479 from henrikhodne/improve-ar-querymethods-includes-docs | Yves Senn | 2013-07-17 | 1 | -0/+8 |
|\ \ | | | | | | | Improve ActiveRecord::QueryMethods#includes docs [ci skip] | ||||
| * | | Improve ActiveRecord::QueryMethods#includes docs | Henrik Hodne | 2013-07-17 | 1 | -0/+8 |
|/ / | | | | | | | | | | | | | | | It's not immediately clear whether you can pass in multiple relations or not. After going through the code a bit, I saw that the arguments are just appended to an array. Also, added nested relations example. [ci skip] | ||||
* | | Merge pull request #11478 from newton10471/master | Yves Senn | 2013-07-17 | 1 | -1/+1 |
|\ \ | | | | | | | fixes plugin test for tutorial [ci skip] | ||||
| * | | fixes plugin test for tutorial | Matt Newton | 2013-07-17 | 1 | -1/+1 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | Merge pull request #11469 from bvogel/master | Carlos Antonio da Silva | 2013-07-17 | 4 | -6/+6 |
|\ \ \ | |/ / |/| | | Update bcrypt-ruby stable version to 3.1 | ||||
| * | | bcrypt-ruby stable is 3.1 | Burkhard Vogel-Kreykenbohm | 2013-07-17 | 4 | -6/+6 |
| |/ | |||||
* / | Refactor to reduce number of loops | Andrew White | 2013-07-17 | 1 | -15/+25 |
|/ | | | | | | Only build the missing_keys array once we have detected that there actually are missing keys by moving the check to be part of the block that performs the path substitution. | ||||
* | Fix failing test missed for the past year :( | Andrew White | 2013-07-17 | 2 | -3/+18 |
| | | | | | | | | | When optimized path helpers were re-introduced in d7014bc the test added in a328f2f broke but no-one noticed because it wasn't being run by the test suite. Fix the test by checking for nil values or empty strings after the args have been parameterized. | ||||
* | Added routing in test for actionpack | Arun Agrawal | 2013-07-17 | 1 | -2/+4 |
| | |||||
* | Revert "Merge pull request #11120 from awilliams/ar_mysql2_boolean_quoting" | Yves Senn | 2013-07-17 | 4 | -53/+6 |
| | | | | | This reverts commit cb1d07e43926bcec95cb8b4a663ca9889173395a, reversing changes made to 754a373e301d2df0b12a11083405252722bc8366. | ||||
* | parent_table is only used internally | Aaron Patterson | 2013-07-16 | 1 | -4/+4 |
| | |||||
* | decouple the manager class from building join constraints | Aaron Patterson | 2013-07-16 | 2 | -10/+11 |
| | |||||
* | cache the klass member of the reflection | Aaron Patterson | 2013-07-16 | 1 | -8/+10 |
| | |||||
* | cache the scope chain on the stack and eliminate `i` | Aaron Patterson | 2013-07-16 | 1 | -7/+4 |
| | |||||
* | just push on to the scope chain items. Oops! (thanks @carlosantoniodasilva) | Aaron Patterson | 2013-07-16 | 1 | -2/+1 |
| | |||||
* | use Relation#merge to combine scope chain items | Aaron Patterson | 2013-07-16 | 1 | -6/+6 |
| | |||||
* | make sure scope_chain_items has consistent types | Aaron Patterson | 2013-07-16 | 1 | -7/+9 |
| | |||||
* | removes the obsolete private method column_methods_hash [Closes #11406] | Xavier Noria | 2013-07-16 | 4 | -43/+28 |
| | |||||
* | Skip Rack applications and redirects when generating urls | Andrew White | 2013-07-16 | 6 | -13/+93 |
| | | | | | | | | | | When generating an unnamed url (i.e. using `url_for` with an options hash) we should skip anything other than standard Rails routes otherwise it will match the first mounted application or redirect and generate a url with query parameters rather than raising an error if the options hash doesn't match any defined routes. Fixes #8018 | ||||
* | Merge pull request #11458 from arunagw/fix_usage_file | Carlos Antonio da Silva | 2013-07-16 | 1 | -1/+1 |
|\ | | | | | Fixed USAGE file for generator [ci skip] | ||||
| * | Fixed USAGE file for generator [ci skip] | Arun Agrawal | 2013-07-16 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #11435 from kennyj/move_to_query_cache | Yves Senn | 2013-07-16 | 2 | -2/+6 |
|\ | | | | | Move initializing process for @query_cache to QueryCache module. | ||||
| * | Move initializing process for query cache to ↵ | kennyj | 2013-07-16 | 2 | -2/+6 |
| | | | | | | | | ActiveRecord::ConnectionAdapters::QueryCache module. | ||||
* | | Merge pull request #11120 from awilliams/ar_mysql2_boolean_quoting | Yves Senn | 2013-07-16 | 4 | -6/+53 |
|\| | | | | | Fixes AR mysql2 adapter incorrectly casting boolean values | ||||
| * | Unifies mysql and mysql2 casting of booleans | awilliams | 2013-07-16 | 4 | -6/+53 |
|/ | | | | | Using the mysql2 adapter, boolean values were sometimes being incorrectly cast to 't' or 'f'. This changes the cast to match the mysql adapter behavior, ie 1 and 0. | ||||
* | `change_column` for PG adapter respects `:array` option. | Yves Senn | 2013-07-16 | 3 | -2/+19 |
| | |||||
* | Merge pull request #11419 from simi/generator_generator_test | Guillermo Iguaran | 2013-07-16 | 8 | -1/+72 |
|\ | | | | | Added generated unit test for generator generator. | ||||
| * | Added generated unit test for generator generator and new test:generators ↵ | Josef Šimánek | 2013-07-16 | 8 | -1/+72 |
|/ | | | | rake task included in test:all rake task. | ||||
* | Lock mysql2 version to 0.3.11 since 0.3.12 is failing right now. Check ↵ | Guillermo Iguaran | 2013-07-16 | 1 | -1/+3 |
| | | | | #11457 for details |