aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Expand)AuthorAgeFilesLines
* Unmatched parenthesis fixRobin Dupret2013-03-151-1/+1
* Fix my typoAlexey Muranov2013-03-121-1/+1
* Align indentation in commentsAlexey Muranov2013-03-121-15/+15
* Document nested attributes as hash of hashesAlexey Muranov2013-03-121-2/+26
* Uniq cannot be used directly on an ActiveRecord model. 'DISTINCT field' is th...Daniel Lobato2013-03-121-1/+1
* Minor copy editingNeeraj Singh2013-03-111-4/+4
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-03-101-1/+1
|\
| * TypppoAkira Matsuda2013-03-061-1/+1
* | Preserve magic comments and content encoding of copied migrations.OZAWA Sakuro2013-03-091-3/+12
* | Refactored nested associations so they are more readable. Added commentswangjohn2013-03-081-26/+54
* | Fix changelog indent, remove self from method call in changelog/doc examplesCarlos Antonio da Silva2013-03-081-1/+2
* | The console --sandbox transaction should not be joinableJon Leighton2013-03-081-1/+2
* | Make sure options is a hashRafael Mendonça França2013-03-081-1/+3
* | Avoid short-circuit returnRafael Mendonça França2013-03-081-5/+9
* | Merge pull request #9497 from route/subclass_from_attrsRafael Mendonça França2013-03-081-2/+3
|\ \
| * | Fix ActiveRecord `subclass_from_attrs` when eager_load is false.Dmitry Vorotilin2013-03-061-2/+3
* | | Fix rails console --sandboxJon Leighton2013-03-081-2/+2
* | | Merge pull request #8868 from tehgeekmeister/masterRafael Mendonça França2013-03-081-0/+6
|\ \ \
| * | | If an index can't be found by column, use the index name.Ezekiel Smithburg2013-03-071-0/+6
* | | | Merge pull request #8966 from cfabianski/disable_prepared_statement_when_prep...Rafael Mendonça França2013-03-084-3/+14
|\ \ \ \
| * | | | Unprepared Visitor + unprepared_statementCédric FABIANSKI2013-03-084-3/+14
| |/ / /
* | | | Update test name to reflect change in how scopes merging worksCarlos Antonio da Silva2013-03-081-1/+0
* | | | Merge pull request #9553 from neerajdotname/7365-mergin-scopes-and-whereJon Leighton2013-03-081-3/+13
|\ \ \ \ | |/ / / |/| | |
| * | | Combine scope conditions using ANDNeeraj Singh and John Leighton2013-03-071-3/+13
* | | | SQLite3 3.6.8+ supports savepointsNeeraj Singh2013-03-071-1/+2
|/ / /
* | | Merge pull request #9105 from bemurphy/cache_key_updated_onRafael Mendonça França2013-03-072-1/+7
|\ \ \
| * | | cache_key consults updated_on timestamp if presentBrendon Murphy2013-02-262-1/+7
* | | | Merge pull request #9474 from HonoreDB/masterRafael Mendonça França2013-03-071-0/+3
|\ \ \ \
| * | | | More helpful error message when instantiating an abstract classAaron Weiner2013-03-031-0/+3
* | | | | rake db:structure:dump warns when `mysqldump` is not in PATH.Yves Senn2013-03-061-1/+4
* | | | | `Connection#structure_dump` is no longer used. #9518Yves Senn2013-03-062-19/+0
* | | | | Merge pull request #9507 from senny/9483_migrations_without_transactionsRafael Mendonça França2013-03-061-7/+37
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | transactions can be turned off per Migration.Yves Senn2013-03-051-7/+37
* | | | | Merge pull request #9565 from kennyj/remove_unused_return_valueXavier Noria2013-03-052-3/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Remove unused return value, because collecting_queries_for_explain isn't publ...kennyj2013-03-062-3/+3
| |/ / /
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-03-052-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Fix typoCarson McDonald2013-03-051-1/+1
| * | | Fix WhereChain docs to mention only notErnie Miller2013-03-041-1/+1
* | | | assigning '0.0' to a nullable numeric column does not make it dirtyYves Senn2013-03-051-1/+5
* | | | `ActiveRecord::Base.include_root_in_json` is `false` by default.Yves Senn2013-03-041-1/+1
* | | | Remove .all usage from unscope doc examples [ci skip]Carlos Antonio da Silva2013-03-041-4/+4
* | | | Use 1.9 hash style in changelog and doc examples [ci skip]Carlos Antonio da Silva2013-03-041-3/+3
* | | | Merge pull request #9200 from wangjohn/unscoping_activerecord_mergingJeremy Kemper2013-03-031-0/+94
|\ \ \ \
| * | | | Created an unscope method for removing relations from a chain ofwangjohn2013-03-031-0/+94
| | |/ / | |/| |
* | | | Merge pull request #9532 from neerajdotname/fix-sql-in-exampleCarlos Antonio da Silva2013-03-031-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | fix the sql that is generated from scopingNeeraj Singh2013-03-031-1/+2
* | | | Remove hard coded references to Active Record in railtiesJosé Valim2013-03-023-4/+4
* | | | Merge pull request #9431 from troyk/patch-2Andrew White2013-03-021-4/+1
|\ \ \ \
| * | | | Fix PostgreSQL TIMESTAMP WITH TIME ZONE to return ActiveSupport::TimeTroy Kruthoff2013-03-011-4/+1
* | | | | deal with `#append` and `#prepend` on association collections.Yves Senn2013-03-011-0/+5