aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * Fix merge error when Equality LHS is non-attributeErnie Miller2012-08-172-2/+21
* | Merge pull request #7381 from IPGlider/masterRafael Mendonça França2012-08-171-2/+2
|\ \
| * | Update to activerecord-deprecated_finders on generatorMiguel Herranz2012-08-171-2/+2
|/ /
* | Pull more serialize code into a lazy included moduleJon Leighton2012-08-171-60/+63
* | don't call method unless we need toJon Leighton2012-08-171-1/+1
* | align them assignmentsJon Leighton2012-08-171-4/+4
* | Optimize for the happy pathJon Leighton2012-08-171-11/+14
* | Avoid #any?Jon Leighton2012-08-171-1/+1
* | The default value can be set once in #column_defaultsJon Leighton2012-08-172-9/+16
* | Optimize instantiation for models which don't use serializeJon Leighton2012-08-171-13/+20
* | Avoid deep_dup when intantiating.Jon Leighton2012-08-171-2/+5
* | column default extraction should handle newlines.Aaron Patterson2012-08-172-2/+10
* | Merge pull request #7352 from aripollak/microsecond-timestampRafael Mendonça França2012-08-174-3/+10
|\ \
| * | Fix occasional microsecond conversion inaccuracyAri Pollak2012-08-154-3/+10
* | | Merge pull request #7373 from hollowspace/patch-1Vijay Dev2012-08-171-10/+10
|\ \ \
| * | | Fix slightly broken Markdown syntax in actionpack/CHANGELOG.mdhollowspace2012-08-171-10/+10
* | | | Increase benchmark time to 20 seconds.Jon Leighton2012-08-171-18/+18
| |_|/ |/| |
* | | Use benchmark/ips to measure AR performanceJon Leighton2012-08-172-39/+36
* | | Renaming active_record_deprecated_finders to activerecord-deprecated_findersJon Leighton2012-08-177-13/+13
|/ /
* | Merge pull request #7024 from bogdan/strict_validation_custom_exceptionRafael Mendonça França2012-08-165-5/+40
|\ \
| * | AM::Validation#validates: ability to pass custom exception to `:strict` optionBogdan Gusiev2012-08-065-4/+32
* | | Remove the active_model require from action_dispatch.Rafael Mendonça França2012-08-161-1/+0
* | | remove reference to humans.txt from release notesVijay Dev2012-08-161-2/+0
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-08-1620-87/+176
|\ \ \ | |_|/ |/| |
| * | copy edits [ci skip]Vijay Dev2012-08-162-13/+13
| * | tiny formatting fix in i18n guide [ci skip]Vijay Dev2012-08-151-1/+1
| * | Minor language fix. [ci skip]Erich Menge2012-08-151-2/+2
| * | corrected grammar [ci skip]Mikhail2012-08-141-2/+2
| * | add breathing to reading sentences for flow, cut down the run-ons [ci skip]Soon Van2012-08-132-16/+16
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 20:16:13 +0000