aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* assets.cache_store now defaults to filesystem. You will want to share tmp/ass...José Valim2011-07-126-16/+9
* Merge pull request #2042 from SAP-Oxygen/master-sqlbypass-patchSantiago Pastorino2011-07-121-7/+13
|\
| * Fix for SqlBypass session storeJoseph Wong2011-07-121-7/+13
* | Merge pull request #2041 from SAP-Oxygen/master-session-id-patch-with-testSantiago Pastorino2011-07-122-2/+37
|\ \
| * | Fixed session ID fixation for ActiveRecord::SessionStoreJoseph Wong2011-07-122-2/+37
| |/
* | Merge pull request #2038 from FLOChip/extra_spaceJosé Valim2011-07-122-4/+4
|\ \ | |/ |/|
| * remove extra space since comment_if already returns the space.Teng Siong Ong2011-07-132-4/+4
|/
* Fix failure in test_preserves_existing_fixture_data from test/cases/fixtures_...Jon Leighton2011-07-121-2/+2
* Fix exception if old and new targets are both nil. Fixes #1471.Jon Leighton2011-07-124-2/+15
* Ensure Dir.glob is sortedJoshua Peek2011-07-111-1/+1
* Generate valid default fixtures for models with a type columnMarc-Andre Lafortune2011-07-112-1/+6
* Merge pull request #1722 from AndrewRadev/grouped-selectJosé Valim2011-07-112-2/+48
|\
| * Grouped select helperAndrew Radev2011-07-112-2/+48
* | Merge pull request #1756 from shtirlic/xmlschema_fixJosé Valim2011-07-112-1/+8
|\ \ | |/ |/|
| * Fix xmlschema output with fraction_digits >0shtirlic2011-07-112-1/+8
* | Merge pull request #2032 from dziulius/masterXavier Noria2011-07-111-1/+1
|\ \
| * | #many? uses count instead of select - a bit fasterJulius Markūnas2011-07-111-1/+1
* | | Merge pull request #2009 from vatrai/autoload-todo-newJosé Valim2011-07-118-15/+7
|\ \ \
| * | | TODO fix explicitly loading exceptations, autoload removedVishnu Atrai2011-07-118-15/+7
* | | | Require assets in all environments by default and provide a way to opt-out fr...José Valim2011-07-112-3/+8
* | | | Merge pull request #2029 from sikachu/acronym_mentionJosé Valim2011-07-111-0/+5
|\ \ \ \ | |_|_|/ |/| | |
| * | | Mention about acronym inflection in config/initializers/inflections.rbPrem Sichanugrist2011-07-111-0/+5
* | | | Merge pull request #1929 from sobrinho/masterSantiago Pastorino2011-07-111-0/+14
|\ \ \ \
| * | | | Create a test case for disable_referential_integrityGabriel Sobrinho2011-07-011-0/+14
* | | | | Merge pull request #1608 from sishen/sishenJosé Valim2011-07-112-1/+25
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | MemcacheStore: deserialize the entry reading from local_cache when using rawDingding Ye2011-06-102-1/+25
* | | | | Merge pull request #1296 from c42engineering/issue636José Valim2011-07-112-1/+50
|\ \ \ \ \
| * | | | | Issue #636 - Parsing an xml file with multiple records and extra attributes (...Sidu Ponnappa2011-07-112-1/+50
* | | | | | Merge pull request #1924 from cesario/1922-get-back-and-deprecate-env-defaultJosé Valim2011-07-112-0/+18
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Rails.application#env_config is now public API. [Closes #1924]Franck Verrot2011-07-112-0/+18
|/ / / / /
* | | | | Merge pull request #1823 from gnarg/masterSantiago Pastorino2011-07-102-2/+10
|\ \ \ \ \
| * | | | | Log instrumentation name for exists? queriesJon Guymon2011-06-222-2/+10
* | | | | | Make Rails.groups accept arrays.José Valim2011-07-102-4/+7
* | | | | | Merge pull request #2026 from spohlenz/asset-tag-fixJosé Valim2011-07-101-0/+2
|\ \ \ \ \ \
| * | | | | | Include TagHelper within AssetTagHelperSam Pohlenz2011-07-101-0/+2
|/ / / / / /
* | | | | | to_key on a destroyed model should return nilSantiago Pastorino2011-07-092-2/+2
* | | | | | Merge pull request #2007 from amatsuda/having_vargs_nomethoderror_fixSantiago Pastorino2011-07-092-8/+15
|\ \ \ \ \ \
| * | | | | | formatsAkira Matsuda2011-07-091-5/+5
| * | | | | | fix AR having() not to raise NoMethodError when the given argument does not r...Akira Matsuda2011-07-092-3/+10
|/ / / / / /
* | | | | | Foo.joins(:bar).includes(:bar) should result in a single query with :bar as a...Jon Leighton2011-07-092-1/+19
* | | | | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-0914-63/+86
|\ \ \ \ \ \
| * | | | | | Add section about debugging assetsRyan Bigg2011-07-091-1/+25
| * | | | | | Clarify that per-controller asset files are not 'magically' loaded by the con...Ryan Bigg2011-07-091-1/+1
| * | | | | | Merge pull request #51 from christopherscott/masterChristopher Scott Hernandez2011-07-081-1/+1
| |\ \ \ \ \ \
| | * | | | | | Updated active_record_querying.textile: intro paragraph of 'Conditions' to ch...Christopher Scott Hernandez2011-07-081-1/+1
| |/ / / / / /
| * | | | | | update Rails version. (rails console didn't exist in 2.1)Vijay Dev2011-07-081-1/+1
| * | | | | | Changed the value that log_level takes to match the examples in the paragraph...Oge Nnadi2011-07-081-1/+1
| * | | | | | minor document editAkira Matsuda2011-07-081-2/+5
| * | | | | | :conditions => whereAkira Matsuda2011-07-083-18/+11
| * | | | | | :joins => joinsAkira Matsuda2011-07-081-12/+12