aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * 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
| * | space for stack overflow; not when you get into things [ci skip]Soon Van2012-08-132-4/+4
| * | Add mini-profiler to performance testing, useful linksPhilipp Weißensteiner2012-08-121-1/+2
| * | Minor punctuation fix in api documentation guide [ci skip]Carlos Antonio da Silva2012-08-111-1/+1
| * | proper casing in pronouns; relocate the pro git book [ci skip]Soon Van2012-08-114-36/+36
| * | Fix caching guide (plural model name) [ci skip]Franco Catena2012-08-101-2/+2
| * | Document the namespacing of controller actions per this discussion:schneems2012-08-091-0/+11
| * | add around_create callback documentation for ActiveModel::Callbacksandrea longhi2012-08-081-0/+11
| * | For adding non css/js files to precompile arraylulalala2012-08-071-0/+2
| * | Update list of finder methodsOscar Del Ben2012-08-061-0/+3
| * | edit of previous contentWeston Platter2012-08-041-19/+59
| * | Add extra documentation to the locale file.Steve Klabnik2012-08-041-2/+21
| * | Document default_options configuration in ActionMailer guide [ci skip]Dejan Simic2012-08-041-0/+2
* | | Merge pull request #7244 from lucasuyezu/masterCarlos Antonio da Silva2012-08-153-2/+24
|\ \ \
| * | | Indentation should consider line number character count.Lucas Uyezu2012-08-133-2/+24
* | | | Remove duplicated changelog entry [ci skip]Carlos Antonio da Silva2012-08-151-6/+0