aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Mention about acronym inflection in config/initializers/inflections.rbPrem Sichanugrist2011-07-111-0/+5
| | | | Closes #1366
* Merge pull request #1823 from gnarg/masterSantiago Pastorino2011-07-102-2/+10
|\ | | | | Log instrumentation name for exists? queries
| * 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 AssetTagHelper
| * | 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
|\ \ | | | | | | having() raises NoMethodError: undefined method `empty?' when the given argument does not respond to empty?
| * | formatsAkira Matsuda2011-07-091-5/+5
| | |
| * | fix AR having() not to raise NoMethodError when the given argument does not ↵Akira Matsuda2011-07-092-3/+10
|/ / | | | | | | | | | | respond to empty? having raises NoMethodError: undefined method `empty?' when a Fixnum or Date/Time were passed via varargs
* | Foo.joins(:bar).includes(:bar) should result in a single query with :bar as ↵Jon Leighton2011-07-092-1/+19
| | | | | | | | a join. Related: #1873.
* | 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 ↵Ryan Bigg2011-07-091-1/+1
| | | | | | | | | | | | controller, but rather need to be required
| * | Merge pull request #51 from christopherscott/masterChristopher Scott Hernandez2011-07-081-1/+1
| |\ \ | | | | | | | | Single word change (find -> where) on active record query page
| | * | Updated active_record_querying.textile: intro paragraph of 'Conditions' to ↵Christopher Scott Hernandez2011-07-081-1/+1
| |/ / | | | | | | | | | change 'find method' to 'where method'
| * | 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 ↵Oge Nnadi2011-07-081-1/+1
| | | | | | | | | | | | paragraph above
| * | minor document editAkira Matsuda2011-07-081-2/+5
| | | | | | | | | | | | the sample model has only 9 lines: https://github.com/lifo/docrails/commit/4d4819fb279386570466b2f99254cd77fb71e05c#commitcomment-467295
| * | :conditions => whereAkira Matsuda2011-07-083-18/+11
| | |
| * | :joins => joinsAkira Matsuda2011-07-081-12/+12
| | |
| * | :include => includesAkira Matsuda2011-07-081-7/+7
| | |
| * | find(:first) => firstAkira Matsuda2011-07-082-6/+6
| | |
| * | find(:all) => allAkira Matsuda2011-07-087-27/+27
| | |
| * | document HashWithIndifferentAccess#extractable_options?Shawn Drost2011-07-071-0/+2
| | |
| * | rails text been added before versionJudeArasu2011-07-051-4/+5
| | |
| * | Remove attachment_fu, add CarrierWave to suggested uploader librariesJames Miller2011-07-051-1/+1
| | |
* | | Merge pull request #2017 from Casecommons/active_record_lintJosé Valim2011-07-082-0/+12
|\ \ \ | | | | | | | | ActiveRecord::Base subclasses should pass ActiveModel::Lint.
| * | | ActiveRecord::Base should pass ActiveModel::Lint.Grant Hutchins & Peter Jaros2011-07-082-0/+12
| | | |
* | | | config should always be an AS::InheritableOptions object. Closes #1992Santiago Pastorino2011-07-082-1/+5
| | | |
* | | | Destroy association habtm record before destroying the record itself. Fixes ↵Tomas D'Stefano2011-07-084-12/+29
| | | | | | | | | | | | | | | | issue #402.
* | | | Ensure that the foreign key gets set when doing record.create_association or ↵Jon Leighton2011-07-082-2/+25
| | | | | | | | | | | | | | | | record.create_association. Fixes #1960.
* | | | Merge pull request #2012 from dasch/refactor_postgres_adapterAaron Patterson2011-07-082-18/+20
|\ \ \ \ | |/ / / |/| | | Refactor PostgreSQLAdapter a bit
| * | | Refactor PostgreSQLAdapter a bitDaniel Schierbeck2011-07-082-18/+20
|/ / / | | | | | | | | | | | | Move the private method #extract_schema_and_table into a separate Utils module so that it can be tested without resorting to #send.
* | | Merge pull request #2010 from hasclass/cache_false_valuesSantiago Pastorino2011-07-082-2/+7
|\ \ \ | | | | | | | | Properly cache value when it is "false"
| * | | Properly cache value when it is "false"Sebi Burkhard2011-07-082-2/+7
| | | |
* | | | Merge pull request #2011 from amatsuda/with_indexSantiago Pastorino2011-07-082-5/+2
|\ \ \ \ | |/ / / |/| | | replaced some "i += 1" sort of codes with Enumerable#with_index
| * | | Use Enumerable#with_index. We're on Ruby > 1.8.7 (part II)Akira Matsuda2011-07-081-3/+1
| | | |
| * | | Use Enumerable#with_index. We're on Ruby > 1.8.7Akira Matsuda2011-07-081-2/+1
|/ / /
* | | use Zlib.crc2 rather that bytes.sum, as per Aaron's suggestionXavier Noria2011-07-082-3/+4
| | | | | | | | | | | | | | | | | | That integer is rather irrelevant, the only thing that matters is that it is consistent and with no apparent bias. Zlib.crc32 is 8-10 times faster than bytes.sum, so use that.
* | | Move config.default_asset_host_protocol to the railtie.José Valim2011-07-072-6/+3
| | |
* | | Don't raise on mass assignment for testJosé Valim2011-07-073-11/+16
| | |
* | | removing brittle assertionAaron Patterson2011-07-071-1/+0
| | |
* | | Merge pull request #2005 from acroca/masterJosé Valim2011-07-072-3/+5
|\ \ \ | | | | | | | | Fixing asset number for asset_path with %d to be consistent in ruby 1.9
| * | | Using the sum of bytes instead the hash of the path when replacing the ↵Albert Callarisa Roca2011-07-082-3/+5
| | | | | | | | | | | | | | | | wildcard of the assets path because in ruby 1.9 is not consistent
* | | | Merge pull request #1767 from jwarwick/rake_notes_dirsSantiago Pastorino2011-07-071-4/+4
|\ \ \ \ | | | | | | | | | | Updated rake:notes to search additional directories
| * | | | Updated rake:notes to search app, config, lib, script and test dirsjwarwick2011-07-061-4/+4
| | | | |
* | | | | Merge pull request #1997 from knapo/masterSantiago Pastorino2011-07-072-2/+7
|\ \ \ \ \ | | | | | | | | | | | | Make `ActiveRecord::Batches#find_each` to not return `self`.
| * | | | | Make `ActiveRecord::Batches#find_each` to not return `self`.knapo2011-07-072-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | This caused that `find_each` was producing extra db call taking all the records from db, and was less efficient than `ActiveRecord::Base#all`.
* | | | | | Merge pull request #1999 from ↵Xavier Noria2011-07-071-0/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | dmitriy-kiriyenko/add_require_active_support_delegation_to_relation Add require ActiveSupport delegation to ActiveRecord::Relation class.