aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | Correct prestreaming controller response status.Kevin Casey2014-02-153-0/+27
* | | | | | | | | | cache queries in the Model.find(id) pathAaron Patterson2014-02-182-0/+28
* | | | | | | | | | add AST cache to the find_by methodAaron Patterson2014-02-171-0/+35
* | | | | | | | | | Merge branch 'master' into adequaterecordAaron Patterson2014-02-1710-43/+69
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #14087 from 10io/patch-1Carlos Antonio da Silva2014-02-171-1/+1
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| | * | | | | | | | Fix coffeescript sample [ci skip]David Fernandez2014-02-131-1/+1
| * | | | | | | | | Revert "Merge pull request #13344 from ccutrer/fix-from-default-select"Rafael Mendonça França2014-02-173-21/+6
| * | | | | | | | | No need to use symbolsRafael Mendonça França2014-02-161-3/+3
| * | | | | | | | | Don't skip tests if they are not broken. Just don't define theyRafael Mendonça França2014-02-162-9/+5
| * | | | | | | | | Fix typo [ci skip]Rafael Mendonça França2014-02-162-2/+2
| * | | | | | | | | Merge pull request #13512 from gsamokovarov/hstore_arrays_fixGuillermo Iguaran2014-02-164-7/+52
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Resolve encoding issues with arrays of hstore (bug 11135).Josh Goodall2014-02-174-7/+52
| |/ / / / / / / / /
* | | | | | | | | | 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