Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Require assets in all environments by default and provide a way to opt-out ↵ | José Valim | 2011-07-11 | 2 | -3/+8 |
| | | | | from uglifier. | ||||
* | 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 | ||||
| * | Mention about acronym inflection in config/initializers/inflections.rb | Prem Sichanugrist | 2011-07-11 | 1 | -0/+5 |
| | | | | | | | | Closes #1366 | ||||
* | | Merge pull request #1929 from sobrinho/master | Santiago Pastorino | 2011-07-11 | 1 | -0/+14 |
|\ \ | | | | | | | Create a test case for disable_referential_integrity | ||||
| * | | 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 | ||||
| * | | | 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 |
|\ \ \ \ | | | | | | | | | | | Resubmitting issue #636 as a pull request | ||||
| * | | | | Issue #636 - Parsing an xml file with multiple records and extra attributes ↵ | Sidu Ponnappa | 2011-07-11 | 2 | -1/+50 |
| | | | | | | | | | | | | | | | | | | | | (besides type) fails | ||||
* | | | | | Merge pull request #1924 from cesario/1922-get-back-and-deprecate-env-default | José Valim | 2011-07-11 | 2 | -0/+18 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Put back Rails.application#env_default and deprecate it [Closes #1922] | ||||
| * | | | | 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 | ||||
| * | | | | 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 | ||||
| * | | | | | 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 |
|\ \ \ \ \ | | | | | | | | | | | | | having() raises NoMethodError: undefined method `empty?' when the given argument does not respond to empty? | ||||
| * | | | | | formats | Akira Matsuda | 2011-07-09 | 1 | -5/+5 |
| | | | | | | |||||
| * | | | | | fix AR having() not to raise NoMethodError when the given argument does not ↵ | Akira Matsuda | 2011-07-09 | 2 | -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 Leighton | 2011-07-09 | 2 | -1/+19 |
| | | | | | | | | | | | | | | | | | | | | a join. Related: #1873. | ||||
* | | | | | 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 ↵ | Ryan Bigg | 2011-07-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | controller, but rather need to be required | ||||
| * | | | | | Merge pull request #51 from christopherscott/master | Christopher Scott Hernandez | 2011-07-08 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Single word change (find -> where) on active record query page | ||||
| | * | | | | | Updated active_record_querying.textile: intro paragraph of 'Conditions' to ↵ | Christopher Scott Hernandez | 2011-07-08 | 1 | -1/+1 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | change 'find method' to 'where method' | ||||
| * | | | | | 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 ↵ | Oge Nnadi | 2011-07-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | paragraph above | ||||
| * | | | | | minor document edit | Akira Matsuda | 2011-07-08 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | the sample model has only 9 lines: https://github.com/lifo/docrails/commit/4d4819fb279386570466b2f99254cd77fb71e05c#commitcomment-467295 | ||||
| * | | | | | :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 |
| | | | | | | |||||
| * | | | | | find(:all) => all | Akira Matsuda | 2011-07-08 | 7 | -27/+27 |
| | | | | | | |||||
| * | | | | | document HashWithIndifferentAccess#extractable_options? | Shawn Drost | 2011-07-07 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | rails text been added before version | JudeArasu | 2011-07-05 | 1 | -4/+5 |
| | | | | | | |||||
| * | | | | | Remove attachment_fu, add CarrierWave to suggested uploader libraries | James Miller | 2011-07-05 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #2017 from Casecommons/active_record_lint | José Valim | 2011-07-08 | 2 | -0/+12 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | ActiveRecord::Base subclasses should pass ActiveModel::Lint. | ||||
| * | | | | | | ActiveRecord::Base should pass ActiveModel::Lint. | Grant Hutchins & Peter Jaros | 2011-07-08 | 2 | -0/+12 |
| | | | | | | | |||||
* | | | | | | | config should always be an AS::InheritableOptions object. Closes #1992 | Santiago Pastorino | 2011-07-08 | 2 | -1/+5 |
| | | | | | | | |||||
* | | | | | | | Destroy association habtm record before destroying the record itself. Fixes ↵ | Tomas D'Stefano | 2011-07-08 | 4 | -12/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue #402. | ||||
* | | | | | | | Ensure that the foreign key gets set when doing record.create_association or ↵ | Jon Leighton | 2011-07-08 | 2 | -2/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | record.create_association. Fixes #1960. | ||||
* | | | | | | | Merge pull request #2012 from dasch/refactor_postgres_adapter | Aaron Patterson | 2011-07-08 | 2 | -18/+20 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Refactor PostgreSQLAdapter a bit | ||||
| * | | | | | | Refactor PostgreSQLAdapter a bit | Daniel Schierbeck | 2011-07-08 | 2 | -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_values | Santiago Pastorino | 2011-07-08 | 2 | -2/+7 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Properly cache value when it is "false" | ||||
| * | | | | | | Properly cache value when it is "false" | Sebi Burkhard | 2011-07-08 | 2 | -2/+7 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #2011 from amatsuda/with_index | Santiago Pastorino | 2011-07-08 | 2 | -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 Matsuda | 2011-07-08 | 1 | -3/+1 |
| | | | | | | | |||||
| * | | | | | | Use Enumerable#with_index. We're on Ruby > 1.8.7 | Akira Matsuda | 2011-07-08 | 1 | -2/+1 |
|/ / / / / / | |||||
* | | | | | | use Zlib.crc2 rather that bytes.sum, as per Aaron's suggestion | Xavier Noria | 2011-07-08 | 2 | -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. |