Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Fix for SqlBypass session store | Joseph Wong | 2011-07-12 | 1 | -7/+13 | |
* | | | | | Merge pull request #2041 from SAP-Oxygen/master-session-id-patch-with-test | Santiago Pastorino | 2011-07-12 | 2 | -2/+37 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fixed session ID fixation for ActiveRecord::SessionStore | Joseph Wong | 2011-07-12 | 2 | -2/+37 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #2038 from FLOChip/extra_space | José Valim | 2011-07-12 | 2 | -4/+4 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | remove extra space since comment_if already returns the space. | Teng Siong Ong | 2011-07-13 | 2 | -4/+4 | |
|/ / / / | ||||||
* | | | | Fix failure in test_preserves_existing_fixture_data from test/cases/fixtures_... | Jon Leighton | 2011-07-12 | 1 | -2/+2 | |
* | | | | Fix exception if old and new targets are both nil. Fixes #1471. | Jon Leighton | 2011-07-12 | 4 | -2/+15 | |
* | | | | Ensure Dir.glob is sorted | Joshua Peek | 2011-07-11 | 1 | -1/+1 | |
* | | | | Generate valid default fixtures for models with a type column | Marc-Andre Lafortune | 2011-07-11 | 2 | -1/+6 | |
* | | | | Merge pull request #1722 from AndrewRadev/grouped-select | José Valim | 2011-07-11 | 2 | -2/+48 | |
|\ \ \ \ | ||||||
| * | | | | Grouped select helper | Andrew Radev | 2011-07-11 | 2 | -2/+48 | |
* | | | | | Merge pull request #1756 from shtirlic/xmlschema_fix | José Valim | 2011-07-11 | 2 | -1/+8 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Fix xmlschema output with fraction_digits >0 | shtirlic | 2011-07-11 | 2 | -1/+8 | |
* | | | | | Merge pull request #2032 from dziulius/master | Xavier Noria | 2011-07-11 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | #many? uses count instead of select - a bit faster | Julius Markūnas | 2011-07-11 | 1 | -1/+1 | |
* | | | | | | Merge pull request #2009 from vatrai/autoload-todo-new | José Valim | 2011-07-11 | 8 | -15/+7 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | TODO fix explicitly loading exceptations, autoload removed | Vishnu Atrai | 2011-07-11 | 8 | -15/+7 | |
* | | | | | | | Require assets in all environments by default and provide a way to opt-out fr... | José Valim | 2011-07-11 | 2 | -3/+8 | |
* | | | | | | | Merge pull request #2029 from sikachu/acronym_mention | José Valim | 2011-07-11 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | Mention about acronym inflection in config/initializers/inflections.rb | Prem Sichanugrist | 2011-07-11 | 1 | -0/+5 | |
* | | | | | | | Merge pull request #1929 from sobrinho/master | Santiago Pastorino | 2011-07-11 | 1 | -0/+14 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Create a test case for disable_referential_integrity | Gabriel Sobrinho | 2011-07-01 | 1 | -0/+14 | |
* | | | | | | | | Merge pull request #1608 from sishen/sishen | José Valim | 2011-07-11 | 2 | -1/+25 | |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | ||||||
| * | | | | | | | MemcacheStore: deserialize the entry reading from local_cache when using raw | Dingding Ye | 2011-06-10 | 2 | -1/+25 | |
* | | | | | | | | Merge pull request #1296 from c42engineering/issue636 | José Valim | 2011-07-11 | 2 | -1/+50 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Issue #636 - Parsing an xml file with multiple records and extra attributes (... | Sidu Ponnappa | 2011-07-11 | 2 | -1/+50 | |
* | | | | | | | | | Merge pull request #1924 from cesario/1922-get-back-and-deprecate-env-default | José Valim | 2011-07-11 | 2 | -0/+18 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Rails.application#env_config is now public API. [Closes #1924] | Franck Verrot | 2011-07-11 | 2 | -0/+18 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #1823 from gnarg/master | Santiago Pastorino | 2011-07-10 | 2 | -2/+10 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Log instrumentation name for exists? queries | Jon Guymon | 2011-06-22 | 2 | -2/+10 | |
* | | | | | | | | | Make Rails.groups accept arrays. | José Valim | 2011-07-10 | 2 | -4/+7 | |
* | | | | | | | | | Merge pull request #2026 from spohlenz/asset-tag-fix | José Valim | 2011-07-10 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Include TagHelper within AssetTagHelper | Sam Pohlenz | 2011-07-10 | 1 | -0/+2 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | to_key on a destroyed model should return nil | Santiago Pastorino | 2011-07-09 | 2 | -2/+2 | |
* | | | | | | | | | Merge pull request #2007 from amatsuda/having_vargs_nomethoderror_fix | Santiago Pastorino | 2011-07-09 | 2 | -8/+15 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | formats | Akira Matsuda | 2011-07-09 | 1 | -5/+5 | |
| * | | | | | | | | | fix AR having() not to raise NoMethodError when the given argument does not r... | Akira Matsuda | 2011-07-09 | 2 | -3/+10 | |
|/ / / / / / / / / | ||||||
* | | | | | | / / | Foo.joins(:bar).includes(:bar) should result in a single query with :bar as a... | Jon Leighton | 2011-07-09 | 2 | -1/+19 | |
| |_|_|_|_|_|/ / |/| | | | | | | | ||||||
* | | | | | | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-07-09 | 14 | -63/+86 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add section about debugging assets | Ryan Bigg | 2011-07-09 | 1 | -1/+25 | |
| * | | | | | | | | Clarify that per-controller asset files are not 'magically' loaded by the con... | Ryan Bigg | 2011-07-09 | 1 | -1/+1 | |
| * | | | | | | | | Merge pull request #51 from christopherscott/master | Christopher Scott Hernandez | 2011-07-08 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Updated active_record_querying.textile: intro paragraph of 'Conditions' to ch... | Christopher Scott Hernandez | 2011-07-08 | 1 | -1/+1 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | update Rails version. (rails console didn't exist in 2.1) | Vijay Dev | 2011-07-08 | 1 | -1/+1 | |
| * | | | | | | | | Changed the value that log_level takes to match the examples in the paragraph... | Oge Nnadi | 2011-07-08 | 1 | -1/+1 | |
| * | | | | | | | | minor document edit | Akira Matsuda | 2011-07-08 | 1 | -2/+5 | |
| * | | | | | | | | :conditions => where | Akira Matsuda | 2011-07-08 | 3 | -18/+11 | |
| * | | | | | | | | :joins => joins | Akira Matsuda | 2011-07-08 | 1 | -12/+12 | |
| * | | | | | | | | :include => includes | Akira Matsuda | 2011-07-08 | 1 | -7/+7 | |
| * | | | | | | | | find(:first) => first | Akira Matsuda | 2011-07-08 | 2 | -6/+6 |