aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #26224 from jonatack/consistent-asset-precompile-examplesEileen M. Uchitelle2016-08-195-10/+11
|\
| * Consistent examples and template for assets#precompileJon Atack2016-08-195-10/+11
* | Merge pull request #26219 from kamipo/remove_unused_blob_or_text_columnRafael França2016-08-192-9/+0
|\ \
| * | Remove unused `blob_or_text_column?` methodRyuta Kamizono2016-08-192-9/+0
* | | Merge pull request #26218 from kamipo/remove_unnecessary_lengthRafael França2016-08-192-12/+6
|\ \ \ | |/ / |/| |
| * | Remove unnecessary `length` method for collection proxyRyuta Kamizono2016-08-192-12/+6
* | | Copy edits in the documentation [ci skip]Rafael Mendonça França2016-08-192-4/+6
* | | Merge pull request #26212 from evmunro/as-json-sets-request-to-json-for-contr...Rafael França2016-08-193-1/+22
|\ \ \
| * | | Set the request type if as: is specifiedEverest Munro-Zeisberger2016-08-183-1/+22
* | | | Merge pull request #25675 from TimPetricola/schema-no-standardized-column-widthsRafael Mendonça França2016-08-194-11/+125
|\ \ \ \
| * | | | Merge branch 'master' into schema-no-standardized-column-widthsTim Petricola2016-08-184-117/+137
| |\| | |
| * | | | Option not to line up column types and attributes in schema.rbTim Petricola2016-08-174-14/+128
* | | | | Add chengelog entry to #25976Rafael Mendonça França2016-08-191-0/+7
* | | | | Merge pull request #26154 from kamipo/remove_text_default_treated_as_empty_st...Rafael Mendonça França2016-08-196-84/+70
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove text default treated as an empty string in non-strict modeRyuta Kamizono2016-08-196-84/+70
* | | | | Merge pull request #26217 from kamipo/revert_23067Rafael França2016-08-191-1/+1
|\ \ \ \ \
| * | | | | Revert "`sql_for_insert` returns values for passing to `exec_insert`"Ryuta Kamizono2016-08-191-1/+1
| |/ / / /
* | | | | Merge pull request #25989 from kamipo/remove_unnecessary_select_for_collectio...Rafael França2016-08-192-11/+6
|\ \ \ \ \
| * | | | | Remove unnecessary `select` method for `CollectionProxy`Ryuta Kamizono2016-08-182-11/+6
* | | | | | Merge pull request #26216 from y-yagi/fixes_19880Rafael França2016-08-193-2/+16
|\ \ \ \ \ \
| * | | | | | run `before_configuration` callbacks as soon as application constant inherits...yuuji.yaginuma2016-08-193-2/+16
| |/ / / / /
* | | | | | Merge pull request #26089 from travisoneill/sqlite_rollback_fixRafael Mendonça França2016-08-194-5/+31
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Added nil case handling to allow rollback migration in case oftravis.h.oneill@gmail.com2016-08-174-5/+31
| |/ / / /
* | | | | Merge pull request #24099 from k0kubun/preserve-readonlyRafael Mendonça França2016-08-185-4/+31
|\ \ \ \ \
| * | | | | Preserve readonly flag only for readonly associationTakashi Kokubun2016-07-305-4/+29
* | | | | | Merge pull request #26200 from kamipo/remove_unnecessary_ordinal_methodsRafael França2016-08-183-93/+84
|\ \ \ \ \ \
| * | | | | | Remove unnecessary ordinal methods for collection associationRyuta Kamizono2016-08-183-93/+84
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #25999 from kamipo/remove_sanitize_conditionsRafael França2016-08-183-4/+8
|\ \ \ \ \ \
| * | | | | | Deprecate `sanitize_conditions`. Use `sanitize_sql` insteadRyuta Kamizono2016-08-183-4/+8
* | | | | | | Merge pull request #26197 from kamipo/remove_unnecessary_test_sql_for_insert_...Rafael França2016-08-182-9/+2
|\ \ \ \ \ \ \
| * | | | | | | Remove unnecessary `test_sql_for_insert_with_returning_disabled`Ryuta Kamizono2016-08-182-9/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #26214 from philnash/active-job-default-queueClaudio B2016-08-181-3/+4
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | [ci skip] Updates ActiveJob guide on default runner.Phil Nash2016-08-181-3/+4
|/ / / / / /
* | | | | | Merge pull request #26193 from iancanderson/ia-document-i18n-required-messageJon Moss2016-08-171-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | i18n documentation for required belongs_to messageIan C. Anderson2016-08-171-0/+1
| |/ / / /
* | | | | Change method visibility to be privateRafael Mendonça França2016-08-171-57/+57
* | | | | Push :defaults extraction down one levelRafael Mendonça França2016-08-172-60/+78
|/ / / /
* | | | Merge pull request #26192 from greenbigfrog/patch-2Jon Moss2016-08-171-0/+1
|\ \ \ \
| * | | | Fix #26187Jonathan2016-08-171-0/+1
|/ / / /
* | | | Merge pull request #26188 from greenbigfrog/patch-2प्रथमेश Sonpatki2016-08-171-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix diffrent naming in getting_started.mdJonathan2016-08-171-1/+1
|/ / /
* | | Merge pull request #25396 from kamipo/fix_error_message_for_out_of_range_inte...Rafael França2016-08-171-1/+1
|\ \ \
| * | | Fix error message for out of range byte size integer value for consistencyRyuta Kamizono2016-08-071-1/+1
* | | | Merge pull request #25628 from ysksn/optionsRafael Mendonça França2016-08-174-5/+11
|\ \ \ \
| * | | | Update CHANGELOG.md for #25628 [ci skip]Yosuke Kabuto2016-07-024-5/+11
* | | | | Merge pull request #26186 from yasulab/fix-link-in-rails5-release-noteGuillermo Iguaran2016-08-161-1/+1
|\ \ \ \ \
| * | | | | Fix link in Rails 5.0 Release Note [ci skip]Yohei YASUKAWA2016-08-171-1/+1
|/ / / / /
* | | | | Merge pull request #25976 from kamipo/pluck_uses_loaded_targetRafael França2016-08-173-2/+20
|\ \ \ \ \
| * | | | | `pluck` should use `records` (`load_target`) when `loaded?` is trueRyuta Kamizono2016-08-043-2/+20
* | | | | | Fix indentationRafael Mendonça França2016-08-171-3/+3