aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9650 from yahonda/group_by_oracleRafael Mendonça França2013-03-101-2/+2
|\
| * Address ActiveRecord::StatementInvalid: OCIError: ORA-00979Yasuo Honda2013-03-111-2/+2
* | document habtm join-table name with custom prefix [ci skip].Yves Senn2013-03-101-0/+2
|/
* Change uniq validation with conditions examples to use where with hashesCarlos Antonio da Silva2013-03-092-5/+5
* Merge pull request #9633 from senny/5321_make_it_lazyCarlos Antonio da Silva2013-03-093-4/+23
|\
| * Uniqueness validation uses a proc to specify the `:conditions` option.Yves Senn2013-03-093-4/+23
* | Merge pull request #9618 from manvsmachine/fix-postgres-enable-extension-errorCarlos Antonio da Silva2013-03-091-1/+1
|\ \
| * | fixes enable_extension bug in postgresql_adapterDarren Woodley2013-03-081-1/+1
* | | Fix "ActiveRecord" => "Active Record" in changelog [ci skip]Carlos Antonio da Silva2013-03-091-4/+3
| |/ |/|
* | Deprecate #connection in favour of accessing it via the classBen Moss2013-03-097-13/+19
* | Use "Fixes" in place of "Fix" in changelogs for consistency [ci skip].Yves Senn2013-03-091-16/+17
* | Merge pull request #9630 from robertjwhitney/update_collection_docsCarlos Antonio da Silva2013-03-091-2/+2
|\ \
| * | Update documentation for collection<< to reflect << on new records.Robert Whitney2013-03-091-2/+2
* | | 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-094-3/+48
| |/ |/|
* | 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-082-4/+6
* | 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-084-2/+22
|\ \
| * | Fix ActiveRecord `subclass_from_attrs` when eager_load is false.Dmitry Vorotilin2013-03-064-2/+22
* | | Refactored test case with standard variable namingAnupam Choudhury2013-03-081-40/+40
* | | Fix rails console --sandboxJon Leighton2013-03-081-2/+2
* | | Merge pull request #8868 from tehgeekmeister/masterRafael Mendonça França2013-03-083-0/+33
|\ \ \
| * | | If an index can't be found by column, use the index name.Ezekiel Smithburg2013-03-073-0/+32
* | | | Merge pull request #8966 from cfabianski/disable_prepared_statement_when_prep...Rafael Mendonça França2013-03-086-3/+33
|\ \ \ \
| * | | | Unprepared Visitor + unprepared_statementCédric FABIANSKI2013-03-086-3/+33
| |/ / /
* | | | Update test name to reflect change in how scopes merging worksCarlos Antonio da Silva2013-03-082-3/+2
* | | | Write a more comprehensive CHANGELOG message [ci skip]Jon Leighton2013-03-081-3/+45
* | | | Merge pull request #9553 from neerajdotname/7365-mergin-scopes-and-whereJon Leighton2013-03-083-6/+22
|\ \ \ \ | |/ / / |/| | |
| * | | Combine scope conditions using ANDNeeraj Singh and John Leighton2013-03-073-6/+22
* | | | SQLite3 3.6.8+ supports savepointsNeeraj Singh2013-03-071-1/+2
|/ / /
* | | Merge pull request #9597 from senny/9110_serialized_not_null_defaultRafael Mendonça França2013-03-074-0/+13
|\ \ \
| * | | test case for `serialize` default values.Yves Senn2013-03-074-0/+13
* | | | Merge pull request #9105 from bemurphy/cache_key_updated_onRafael Mendonça França2013-03-075-3/+39
|\ \ \ \ | |/ / / |/| | |
| * | | cache_key consults updated_on timestamp if presentBrendon Murphy2013-02-265-3/+39
* | | | Merge pull request #9474 from HonoreDB/masterRafael Mendonça França2013-03-073-0/+21
|\ \ \ \
| * | | | More helpful error message when instantiating an abstract classAaron Weiner2013-03-033-0/+21
* | | | | Refactored and removed unnecessary lines in the test caseAnupam Choudhury2013-03-071-3/+3
* | | | | Remove regression test added in 0268b5d8cdc3c5a1337462135f0a326a2654ba1aRafael Mendonça França2013-03-071-8/+0
* | | | | rake db:structure:dump warns when `mysqldump` is not in PATH.Yves Senn2013-03-063-2/+22
* | | | | `Connection#structure_dump` is no longer used. #9518Yves Senn2013-03-066-35/+2
* | | | | Merge pull request #9507 from senny/9483_migrations_without_transactionsRafael Mendonça França2013-03-064-11/+92
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | transactions can be turned off per Migration.Yves Senn2013-03-054-8/+85
| * | | | transactional migration test-case was broken.Yves Senn2013-03-051-3/+7
* | | | | Merge pull request #9565 from kennyj/remove_unused_return_valueXavier Noria2013-03-053-5/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Remove unused return value, because collecting_queries_for_explain isn't publ...kennyj2013-03-063-5/+4
| |/ / /
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-03-053-3/+3
|\ \ \ \ | |/ / / |/| | |