aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Refactor out headers to message assignment from ActionMailer::Base#mailhnatt2015-10-291-3/+6
* Use attr_internal in ActionMailer::Base#mail instead of local var for messagehnatt2015-10-291-11/+9
* Refactor out defaults handling from ActionMailer::Base#mailhnatt2015-10-291-9/+15
* Refactor ActionMailer::Base#collect_responseshnatt2015-10-291-16/+16
* Reduce code duplication in ActionMailer::Base#register_observer and #register...hnatt2015-10-291-16/+12
* Merge pull request #22106 from jamis/fix_default_fixture_class_namesYves Senn2015-10-292-3/+15
|\
| * FixtureSet.fixture_class_names should have no default valueJamis Buck2015-10-292-3/+15
* | Add CHANGELOG entry for #22101 [ci skip]Andrew White2015-10-291-0/+10
* | Merge pull request #16252 from leckylao/actionview-date-helpers-selected-valu...Sean Griffin2015-10-293-1/+30
|\ \
| * | Fix style issues with #16252Sean Griffin2015-10-292-12/+9
| * | making selected value to accept Hash like the default option. E.g. selected: ...Lecky Lao2015-10-293-1/+33
|/ /
* | Revert "Revert "Merge pull request #22026 from akihiro17/fix-preload-associat...Yves Senn2015-10-293-0/+28
* | Merge pull request #22101 from gocardless/ar-pgbouncer-fixAndrew White2015-10-291-4/+5
|\ \
| * | Check standard_conforming_strings is not readonlyHarry Marr2015-10-291-1/+1
| * | Avoid disabling postgres errorsHarry Marr2015-10-281-4/+5
* | | Revert "Merge pull request #22026 from akihiro17/fix-preload-association"Sean Griffin2015-10-293-28/+0
* | | Merge pull request #22118 from cllns/fix-spacing-in-layout-templateRafael França2015-10-291-16/+17
|\ \ \
| * | | Properly indent '<head>' and '<body>' within '<html>'Sean Collins2015-10-291-16/+17
* | | | Deprecate `HWIDA.new_from_hash_copying_default`Sean Griffin2015-10-292-1/+6
|/ / /
* | | Merge pull request #16357 from gchan/hwia-respects-to-hash-defaultSean Griffin2015-10-294-8/+32
|\ \ \
| * | | `HashWithIndifferentAccess.new` respects the default value or proc on objects...Gordon Chan2014-07-314-8/+32
* | | | Merge pull request #19501 from ccutrer/dry_sti_subclass_finding2Sean Griffin2015-10-296-23/+30
|\ \ \ \
| * | | | Fix a stylistic nitpick in #19501Sean Griffin2015-10-291-3/+3
| * | | | Fix test failures caused by #19501Sean Griffin2015-10-293-1/+3
| * | | | Fix merge conflicts from #19501Sean Griffin2015-10-294-23/+28
| |\ \ \ \
| | * | | | DRY up STI subclass logicCody Cutrer2015-03-244-22/+29
* | | | | | Merge pull request #22026 from akihiro17/fix-preload-associationYves Senn2015-10-293-0/+28
|\ \ \ \ \ \
| * | | | | | Set `scope.reordering_value` to `true` if :reordering values are specifiedakihiro172015-10-303-0/+28
| |/ / / / /
* | | | | | Merge pull request #22116 from gsamokovarov/fix-form-for-block-testYves Senn2015-10-291-2/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix a faulty form_for testGenadi Samokovarov2015-10-291-2/+3
* | | | | | tests, no every adapter supports "connection.version"Yves Senn2015-10-292-22/+24
* | | | | | Merge pull request #22114 from oesgalha/docs_use_distinctZachary Scott2015-10-292-5/+5
|\ \ \ \ \ \
| * | | | | | Use #distinct instead of #uniq in the guides [ci skip]oesgalha2015-10-292-5/+5
|/ / / / / /
* | | | | | Ignore scope in missing translation input.Kasper Timm Hansen2015-10-282-1/+9
* | | | | | Merge pull request #21998 from kddeisz/rake_task_statisticsArthur Nogueira Neves2015-10-285-1/+23
|\ \ \ \ \ \
| * | | | | | Allow rake:stats to account for rake tasksKevin Deisz2015-10-195-1/+23
* | | | | | | Merge pull request #18548 from sebjacobs/support-bidirectional-destroy-depend...Sean Griffin2015-10-287-0/+116
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Add support for bidirectional destroy dependenciesSeb Jacobs2015-01-167-1/+119
* | | | | | | Merge pull request #22073 from arunagw/remove-require-sdoc-rakefileArthur Nogueira Neves2015-10-281-1/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove required `sdoc` from RakefileArun Agrawal2015-10-261-1/+0
* | | | | | | | Merge pull request #22099 from yui-knk/doc_as_instrumentationArthur Nogueira Neves2015-10-281-0/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | [ci skip] Add `:binds` to a list of paramaters of `sql.active_record`yui-knk2015-10-281-0/+1
* | | | | | | | Merge pull request #22096 from Gaurav2728/change_deprecated_msgRichard Schneeman2015-10-282-6/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | specify deprecated waring, follow the standard conventionsGaurav Sharma2015-10-282-6/+6
|/ / / / / / /
* | | | | | | Write the cookie jar it was not committed in TestCaseRafael Mendonça França2015-10-282-2/+2
* | | | | | | Remove dead codeRafael Mendonça França2015-10-281-5/+0
* | | | | | | Merge pull request #22095 from ajmyers01/fix_typo_in_eager_load_polymorphic_e...Rafael França2015-10-271-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix Typo in EagerLoadPolymorphicError [ci skip]Alex Myers2015-10-271-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #18383 from scambra/habtm-with-where-includes-16032-for-ma...Rafael Mendonça França2015-10-273-1/+40
|\ \ \ \ \ \ \
| * | | | | | | Includes HABTM returns correct size now. It's caused by the join dependencySergio Cambra2015-01-073-2/+41