aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7409 from kennyj/refactor_activerecord_resultRafael Mendonça França2012-08-213-18/+4
|\
| * Refactor AR::Result or inherits. Because we have redundant codes aboutkennyj2012-08-223-18/+4
|/
* Merge pull request #7408 from yahonda/sqlmode_mysqlCarlos Antonio da Silva2012-08-212-6/+8
|\
| * Rename to test_mysql_strict_mode_disabled_dont_override_global_sql_modeYasuo Honda2012-08-222-6/+8
|/
* Merge pull request #7406 from janko-m/documentation_fixesRafael Mendonça França2012-08-212-45/+45
|\
| * Fix documentation mistakesJanko Marohnić2012-08-212-45/+45
* | Merge pull request #7000 from kennyj/fix_6697-3Rafael Mendonça França2012-08-218-11/+31
|\ \
| * | Use instance_accessor: false instead of instance_writer.kennyj2012-08-218-11/+31
|/ /
* | Add CHANGELOG entry for #6986Rafael Mendonça França2012-08-211-0/+5
* | Merge pull request #6986 from kennyj/fix_6975Rafael Mendonça França2012-08-212-5/+29
|\ \
| * | Round usec when writing timestamp attribute.kennyj2012-08-212-5/+29
|/ /
* | Minor refactoring in Active Record model schema methodsCarlos Antonio da Silva2012-08-211-5/+3
* | removing dead codeAaron Patterson2012-08-201-19/+7
* | define singleton methods rather than adding and removing methodsAaron Patterson2012-08-201-45/+32
* | remove dead codeAaron Patterson2012-08-201-78/+36
* | initialize instance variables for transactions to remove conditionalsAaron Patterson2012-08-202-8/+7
* | This method is useless without a block, so remove testAaron Patterson2012-08-201-11/+9
* | remove unused variableAaron Patterson2012-08-201-1/+1
* | initialize instance variables to avoid conditionalsAaron Patterson2012-08-201-2/+7
* | fix whitespace errorsAaron Patterson2012-08-201-2/+2
* | Revert "removes unused optional argument in AS::Dependencies::Loadable#load"Xavier Noria2012-08-201-1/+1
* | removes unused optional argument in AS::Dependencies::Loadable#loadXavier Noria2012-08-201-1/+1
* | Merge pull request #7401 from frodsan/fix_environments_punctuationCarlos Antonio da Silva2012-08-207-12/+12
|\ \
| * | fix punctuation in config templatesFrancesco Rodriguez2012-08-207-12/+12
|/ /
* | Make sure :via works with mountPratik Naik2012-08-202-2/+12
* | Merge pull request #7396 from tomykaira/cleanup_testRafael Mendonça França2012-08-201-11/+11
|\ \ | |/ |/|
| * Access @rs only through attr_accessortomykaira2012-08-201-11/+11
|/
* removes the second argument of the AS const_missing hookXavier Noria2012-08-191-8/+22
* Remove private verify readonly attr methodCarlos Antonio da Silva2012-08-191-5/+1
* no need for AS::Dependencies.(hook!|unhook!) to return anything in particularXavier Noria2012-08-191-2/+0
* Merge pull request #7392 from ernie/real-fix-for-last-equality-wins-in-mergeRafael Mendonça França2012-08-192-14/+12
|\
| * Fix "last equality wins" logic in relation mergeErnie Miller2012-08-192-14/+12
|/
* Merge pull request #7377 from brainopia/use_inversed_parent_for_first_and_las...Carlos Antonio da Silva2012-08-183-1/+11
|\
| * Use inversed parent for first and last child of has_many associationbrainopia2012-08-183-1/+11
* | Merge pull request #7390 from aantix/add_x_content_type_options_to_default_he...Rafael Mendonça França2012-08-184-5/+9
|\ \
| * | Added X-Content-Type-Options to the header defaults.Jim Jones2012-08-184-5/+9
|/ /
* | Merge branch 'multiparameter-attributes-refactor'Carlos Antonio da Silva2012-08-182-76/+104
|\ \ | |/ |/|
| * Get rid of some arguments by using the accessorsCarlos Antonio da Silva2012-08-181-30/+31
| * Move multiparameter attribute logic to a classCarlos Antonio da Silva2012-08-181-72/+84
| * Some more cleanup to use Hash#values_at, and some method docsCarlos Antonio da Silva2012-08-181-3/+7
| * Use cached column information to instantiate time objectCarlos Antonio da Silva2012-08-181-6/+6
| * Refactor blank date parameter validationCarlos Antonio da Silva2012-08-181-2/+6
| * Refactor missing parameter validation based on positionCarlos Antonio da Silva2012-08-182-8/+12
| * Reuse already fetched column to check for :timeCarlos Antonio da Silva2012-08-181-5/+6
| * Refactor some code in multiparameter assignmentCarlos Antonio da Silva2012-08-181-26/+25
| * Extract nested parameter assignment to a separate methodCarlos Antonio da Silva2012-08-181-3/+6
|/
* Merge pull request #6903 from guilleiguaran/dalli-memcache-storeSantiago Pastorino2012-08-175-42/+37
|\
| * Add test to cover increment/decrement of non-existing key in MemCacheStoreGuillermo Iguaran2012-08-171-0/+2
| * Replace deprecated `memcache-client` gem with `dalli` in ActiveSupport::Cache...Guillermo Iguaran2012-08-175-42/+35
|/
* Merge pull request #7380 from ernie/fix-nomethoderror-on-non-attribute-equali...Aaron Patterson2012-08-172-2/+21
|\