aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Partially merge #17650Sean Griffin2015-03-263-147/+20
|\
| * PostgreSQL, Use ruby-pg's built-in capabilities for array en-/decoding in C.Lars Kanis2015-03-253-147/+10
| * PostgreSQL, Add input type casts for primitive types.Lars Kanis2015-03-251-0/+10
* | Partially merge #17650Sean Griffin2015-03-268-24/+24
|\|
| * PostgreSQL, Fix OID based type casts in C for primitive types.Lars Kanis2015-03-258-24/+24
* | Merge pull request #18846 from hundredwatt/feat/warn-on-result-set-sizeRafael Mendonça França2015-03-265-0/+102
|\ \
| * | Add `config.active_record.warn_on_records_fetched_greater_than` optionJason Nochlin2015-03-255-0/+102
| |/
* | Merge pull request #19536 from JuanitoFatas/doc/av-determine_templateRafael Mendonça França2015-03-261-1/+1
|\ \
| * | Add missing :html option in determine_template error message.Juanito Fatas2015-03-271-1/+1
|/ /
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-03-2612-40/+41
|\ \
| * | [ci skip] Fix `&>` with `%>`yui-knk2015-03-251-9/+9
| * | Rails 5 requires 2.2.1. [ci skip]Juanito Fatas2015-03-241-1/+1
| * | [ci skip] Change to a singular form (`the comment model`)yui-knk2015-03-241-1/+1
| * | [ci skip] Capitalize titleyui-knk2015-03-221-1/+1
| * | Better title in Testing GuideKir Shatrov2015-03-221-1/+1
| * | [ci skip] Add a line between code example and docsyui-knk2015-03-211-0/+1
| * | [ci skip] Add <tt> tag to `save!` and `create!`yui-knk2015-03-211-1/+1
| * | [ci skip] Fix link formatyui-knk2015-03-151-1/+1
| * | [ci skip] Remove spacesyui-knk2015-03-141-27/+27
| * | [ci skip] Add space after erb block.yui-knk2015-03-121-1/+1
| * | [ci skip] Add space after erb block.yui-knk2015-03-121-1/+1
| * | Add backquote to :as option.yui-knk2015-03-111-1/+1
| * | [ci skip] Remove unnecessary spaceyui-knk2015-03-041-2/+2
| * | [ci skip] Fix fenced code block langyui-knk2015-03-031-1/+1
| * | [ci skip] Add `.`yui-knk2015-03-031-1/+1
* | | Merge pull request #19521 from mudphone/test_fixture_docsArthur Nogueira Neves2015-03-251-2/+2
|\ \ \ | |_|/ |/| |
| * | [skip ci] Minor edits for clarity, to make smooth, & separate clauses.Kyle Oba2015-03-251-2/+2
|/ /
* | Merge pull request #19496 from andreynering/docs-migrations-changeKasper Timm Hansen2015-03-251-0/+8
|\ \
| * | Documenting remove_column as a reversible migration method [ci skip]Andrey Nering2015-03-251-0/+8
|/ /
* | Merge pull request #19503 from jasoncodes/no-psqlrcYves Senn2015-03-253-3/+7
|\ \
| * | Avoid loading user's psqlrc when loading test structureJason Weathered2015-03-251-1/+1
* | | Merge pull request #19507 from jonatack/ar-validations-guide-fixesKasper Timm Hansen2015-03-251-3/+5
|\ \ \
| * | | [ci skip] Active Record Validations guide fixesJon Atack2015-03-251-3/+5
|/ / /
* | | Merge pull request #19504 from y-yagi/fix_digest_explainClaudio B.2015-03-241-2/+1
|\ \ \ | |/ / |/| |
| * | update `config.assets.digest` default value in guides [ci skip]yuuji.yaginuma2015-03-251-2/+1
|/ /
* | Merge pull request #19502 from kaspth/assert-select-failure-outputRafael Mendonça França2015-03-241-0/+24
|\ \
| * | [ci skip] Update 4.2 Release notes with more assert_select information.Kasper Timm Hansen2015-03-241-0/+24
* | | Merge pull request #19499 from swalkinshaw/patch-1Arthur Nogueira Neves2015-03-241-7/+2
|\ \ \ | |/ / |/| |
| * | Update ActiveSupport::Subscriber docsScott Walkinshaw2015-03-241-7/+2
* | | Add changelog entry for #19271Arthur Neves2015-03-241-0/+7
* | | Revert "Merge pull request #19500 from ccutrer/dry_sti_subclass_finding"Rafael Mendonça França2015-03-241-19/+19
* | | Merge pull request #19500 from ccutrer/dry_sti_subclass_findingRafael Mendonça França2015-03-241-19/+19
|\ \ \ | |/ / |/| |
| * | DRY up STI subclass logicCody Cutrer2015-03-241-19/+19
|/ /
* | Merge pull request #19452 from pinglamb/fix-referencing-wrong-alias-when-join...Carlos Antonio da Silva2015-03-243-1/+19
|\ \
| * | Fix referencing wrong aliases while joining tables of has many throughpinglamb2015-03-223-1/+19
* | | Merge pull request #19493 from larskanis/add_infinity_testYves Senn2015-03-241-0/+9
|\ \ \
| * | | PostgreSQL, Add test case for "Infinity" string assignment to float columns.Lars Kanis2015-03-221-0/+9
| |/ /
* | | Merge pull request #19488 from yui-knk/fix/comment2Yves Senn2015-03-241-1/+1
|\ \ \
| * | | [ci skip] Remove unacceptable method nameyui-knk2015-03-241-1/+1
* | | | Merge pull request #19491 from tgxworld/fix_incorrect_descriptionYves Senn2015-03-241-1/+1
|\ \ \ \ | |/ / / |/| | |