aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into adequaterecordAaron Patterson2014-02-17300-1660/+4974
|\
| * Merge pull request #13937 from ktaragorn/guides_fixesVijay Dev2014-02-162-3/+14
| |\
| | * Getting started guide fixes & Explain X-SendFile a little better, with linksKarthik T2014-02-142-3/+14
| * | Merge pull request #14072 from robin850/patch-16Rafael Mendonça França2014-02-151-0/+7
| |\ \
| | * | Add a missing changelog entry for #13981 and #14035Robin Dupret2014-02-151-0/+7
| |/ /
| * | Merge pull request #14069 from arunagw/aa-plugin-generator-build-fixCarlos Antonio da Silva2014-02-151-4/+1
| |\ \
| | * | Revert "Fixed plugin_generator test"Arun Agrawal2014-02-151-4/+1
| |/ /
| * | implements new option :month_format_string for date select helpers [Closes #1...Xavier Noria2014-02-153-9/+48
| * | add factory methods for empty alias trackersAaron Patterson2014-02-143-23/+38
| * | guarantee a list in the alias tracker so we can remove a conditionalAaron Patterson2014-02-143-6/+12
| * | stop exposing table_joinsAaron Patterson2014-02-141-4/+3
| * | make most parameters to the AliasTracker requiredAaron Patterson2014-02-142-6/+4
| * | make a singleton for AssociationScopeAaron Patterson2014-02-143-3/+8
| * | pass the association and connection to the scope methodAaron Patterson2014-02-143-11/+7
| * | pass the tracker down the stack and construct it in the scope methodAaron Patterson2014-02-141-18/+18
| * | clean up add_constraints signatureAaron Patterson2014-02-141-8/+9
| * | remove the reflection delegateAaron Patterson2014-02-141-15/+14
| * | remove klass delegatorAaron Patterson2014-02-141-10/+11
| * | remove railties changes. fixes #14054Aaron Patterson2014-02-146-191/+10
| * | remove chain delegateAaron Patterson2014-02-141-5/+6
| * | remove scope_chain delegateAaron Patterson2014-02-141-3/+3
| * | Merge pull request #14061 from davejachimiak/add_verb_in_guidesRafael Mendonça França2014-02-141-1/+1
| |\ \
| | * | Add verb to sanitization noteDave Jachimiak2014-02-141-1/+1
| |/ /
| * | Merge pull request #14060 from kassio/masterRafael Mendonça França2014-02-143-6/+6
| |\ \
| | * | fix path shown in mailer's templatesKassio Borges2014-02-143-6/+6
| |/ /
| * | Merge pull request #14048 from pcreux/better-error-message-db-migrate-downCarlos Antonio da Silva2014-02-141-1/+1
| |\ \
| | * | Add hint to error message of task db:migrate:downPhilippe Creux2014-02-131-1/+1
| * | | Merge pull request #14057 from rajcybage/Ar_remove_unnecessary_fixturesCarlos Antonio da Silva2014-02-141-1/+1
| |\ \ \
| | * | | remove unused fixtures from sqlite3 test casesRajarshi Das2014-02-141-1/+1
| * | | | Merge pull request #14059 from tbpgr/guides_active_support_core_extCarlos Antonio da Silva2014-02-141-0/+2
| |\ \ \ \
| | * | | | fix guide active_support_core_extensions. add Note to String#indent [ci skip]tbpgr2014-02-141-0/+2
| | |/ / /
| * | | | Merge pull request #14058 from lantoli/masterRafael Mendonça França2014-02-141-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | updated Travis build status image urlLeo Antoli2014-02-141-1/+1
| |/ / /
| * | | remove more delegate methodsAaron Patterson2014-02-131-7/+9
| * | | :scissors: whitespaceAaron Patterson2014-02-131-1/+0
| * | | rm delegate methods that are not actually usedAaron Patterson2014-02-131-2/+2
| * | | JoinHelper is never reused, so there is no need to separateAaron Patterson2014-02-133-42/+25
| * | | No variant should also be picked up by variant.any if variant.none is not def...David Heinemeier Hansson2014-02-132-1/+5
| * | | speed up the collection proxy reader method, but slow down the constructorAaron Patterson2014-02-131-1/+5
| * | | Merge pull request #14047 from strzalek/variants-array-checkDavid Heinemeier Hansson2014-02-132-2/+10
| |\ \ \
| | * | | Check if variant array contains only symbolsŁukasz Strzałkowski2014-02-132-2/+10
| * | | | Merge pull request #14034 from hdabrows/drop-correct-index-when-reverting-mig...Yves Senn2014-02-134-4/+49
| |\ \ \ \
| | * | | | Drop the correct index after reverting a migrationHubert Dąbrowski2014-02-134-4/+49
| * | | | | Merge pull request #14045 from arthurnn/kill_fibersGuillermo Iguaran2014-02-131-2/+4
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Dont use Enumarator on join_associationArthur Neves2014-02-131-2/+4
| * | | | | Merge pull request #14043 from strzalek/variants-negotiationDavid Heinemeier Hansson2014-02-135-12/+51
| |\ \ \ \ \
| | * | | | | Variant negotiationLukasz Strzalkowski2014-02-135-12/+51
| * | | | | | tests are responsible to clean up afterwards.Yves Senn2014-02-131-82/+114
| |/ / / / /
| * | | | | Merge pull request #13945 from rails/json_cookie_serializer_improvementsGuillermo Iguaran2014-02-1316-123/+316
| |\ \ \ \ \
| | * | | | | rm warning about variable shadowingGodfrey Chan2014-02-111-2/+2