aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-09-182-2/+2
|\
| * [ci skip] Fix module name of documentyui-knk2015-09-171-1/+1
| * [ci skip] Replace double spaces with single spaceyui-knk2015-09-171-1/+1
* | File encoding is defaulted to utf-8 in Ruby >= 2.1Akira Matsuda2015-09-185-7/+0
* | D HH => D H HAkira Matsuda2015-09-181-1/+1
* | Merge pull request #21654 from yui-knk/fix/doc_apiArthur Nogueira Neves2015-09-171-7/+1
|\ \
| * | [ci skip] Remove useless "@api public/private"yui-knk2015-09-171-7/+1
* | | Merge pull request #21581 from ronakjangir47/restrict_with_errorYves Senn2015-09-175-2/+44
|\ \ \ | |/ / |/| |
| * | `restrict_with_error` message will now respect owner’s human name in any lo...Ronak Jangir2015-09-124-2/+39
* | | Merge pull request #21637 from amitsuroliya/doc_fixesKasper Timm Hansen2015-09-171-2/+2
|\ \ \
| * | | Improved ActiveRecord Connection Pool docs [ci skip]amitkumarsuroliya2015-09-171-2/+2
* | | | Merge pull request #21566 from ronakjangir47/active_record2Kasper Timm Hansen2015-09-168-58/+85
|\ \ \ \
| * | | | Removed mocha from Active Record Part 2Ronak Jangir2015-09-168-58/+85
| | |/ / | |/| |
* | | | s/Github/GitHub/Akira Matsuda2015-09-171-1/+1
* | | | Merge pull request #21646 from schneems/schneems/no-hardcoded-ignored-lines-i...Richard Schneeman2015-09-161-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Don't hardcode table nameschneems2015-09-161-1/+1
* | | | [ci skip] Remove `DEFAULT NULL` from examplesYasuo Honda2015-09-161-2/+2
* | | | Merge pull request #21623 from schneems/schneems/schema-migration-docsRichard Schneeman2015-09-151-1/+5
|\ \ \ \
| * | | | Doc SchemaMigration class.schneems2015-09-141-1/+5
* | | | | Merge pull request #20848 from deivid-rodriguez/fix_undefined_method_error_on...Arthur Nogueira Neves2015-09-141-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix undefined method error on exceptionDavid Rodríguez2015-07-111-1/+1
* | | | | Fix doc of limit option for a text column [ci skip]Ryuta Kamizono2015-09-141-2/+2
* | | | | Merge pull request #21591 from kamipo/text_and_blob_limit_is_byte_lengthRafael Mendonça França2015-09-131-2/+2
|\ \ \ \ \
| * | | | | TEXT and BLOB limit is byte length, not character length.Ryuta Kamizono2015-09-111-2/+2
* | | | | | Merge pull request #21568 from amitsuroliya/mysql_version_updateRafael Mendonça França2015-09-135-9/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Updated MySQL documentation link to MySQL latest version 5.7 everywhere [ci s...amitkumarsuroliya2015-09-105-9/+9
| | |_|/ / | |/| | |
* / | | | Explicitly require AR/attribute where using itAkira Matsuda2015-09-101-0/+2
|/ / / /
* | | | remove dead code.Yves Senn2015-09-092-7/+1
* | | | Merge pull request #21486 from bogdan/refactor-has-many-counter-cacheEileen M. Uchitelle2015-09-094-71/+61
|\ \ \ \
| * | | | HasManyAssociation: moved half of counter cache code to reflectionBogdan Gusiev2015-09-034-71/+61
* | | | | Merge pull request #21529 from rngtng/move-migrations-paths-to-database-taskYves Senn2015-09-091-7/+7
|\ \ \ \ \
| * | | | | Use `ActiveRecord::Tasks::DatabaseTasks.migrations_paths` instead of `Migrato...Tobias Bielohlawek2015-09-071-9/+8
* | | | | | remove dead code.Yves Senn2015-09-091-4/+0
* | | | | | adjust method visibility according to it's usage.Yves Senn2015-09-091-18/+18
* | | | | | Don't set the default argumentRafael Mendonça França2015-09-091-1/+1
* | | | | | Invert the conditionalRafael Mendonça França2015-09-091-1/+1
* | | | | | Remove dead codeRafael Mendonça França2015-09-091-6/+0
* | | | | | Revert "Merge pull request #20080 from robertjlooby/fix_overwriting_by_dynami...Rafael Mendonça França2015-09-093-24/+3
* | | | | | Merge pull request #20080 from robertjlooby/fix_overwriting_by_dynamic_findersRafael Mendonça França2015-09-093-3/+24
|\ \ \ \ \ \
| * | | | | | put dynamic matchers on the GeneratedAssociationMethods instead of modelRob Looby2015-05-083-3/+24
* | | | | | | Merge pull request #21554 from ronakjangir47/added_nodocRafael Mendonça França2015-09-091-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Added nodoc for `arel` method which returns object of private api. [ci skip]Ronak Jangir2015-09-091-1/+1
* | | | | | | | Merge pull request #20921 from pboling/fix-sql-colors-in-log-subscriberRafael Mendonça França2015-09-092-7/+125
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove extraneous `then` from case statementPeter Boling2015-07-172-14/+39
| * | | | | | | | Improve sql logging coloration in `ActiveRecord::LogSubscriber`.Peter Boling2015-07-173-7/+143
* | | | | | | | | Fix docs of AR::Timestamp to match #15726claudiob2015-09-081-5/+12
* | | | | | | | | Merge pull request #21535 from dmitry/feature/validate-multiple-contextsRafael Mendonça França2015-09-082-1/+12
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Validate multiple contexts on `valid?` and `invalid?` at once.Dmitry Polushkin2015-09-072-1/+12
* | | | | | | | | Merge pull request #21511 from rwz/ar-exceptions-no-argsEileen M. Uchitelle2015-09-085-66/+178
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make ActiveRecordException descendants args optionalPavel Pravosud2015-09-075-66/+178