aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #12071 from Crunch09/outer_joinsSean Griffin2015-10-307-16/+176
|\
| * added ActiveRecord::Relation#left_outer_joinsFlorian Thomas2015-05-197-16/+176
* | Add version constraint to database gem in generated applicationRafael Mendonça França2015-10-294-17/+32
* | Revert "ActionController::Base#process() now only takes an action name"Aaron Patterson2015-10-293-6/+22
* | Ensure `has_and_belongs_to_many` works with `belongs_to_required_by_default`Sean Griffin2015-10-293-2/+16
* | ActionController::Base#process() now only takes an action nameAaron Patterson2015-10-293-22/+6
* | switch to JSON.dump to avoid infinite recursionAaron Patterson2015-10-291-1/+1
* | Add a changelog entry for #13008Sean Griffin2015-10-291-0/+4
* | Merge pull request #13008 from ktheory/sanitize_orderSean Griffin2015-10-292-0/+12
|\ \
| * | Support SQL sanitization in AR::QueryMethods#orderAaron Suggs2013-11-222-0/+12
* | | use `dispatch` instead of `process` to run requests thougheileencodes2015-10-292-8/+8
* | | Remove unnecessary methodeileencodes2015-10-291-3/+0
* | | Merge pull request #19511 from larskanis/replace_const_conn_paramsSean Griffin2015-10-291-7/+2
|\ \ \
| * | | PostgreSQL, Replace static connection param list by the one built into libpq.Lars Kanis2015-03-251-7/+2
* | | | Merge pull request #22121 from gocardless/patch-2Andrew White2015-10-292-12/+10
|\ \ \ \
| * | | | Don't disable errors when turning standard_conforming_strings onHarry Marr2015-10-292-12/+10
* | | | | Merge pull request #22119 from philr/time_with_zone_documentationAndrew White2015-10-291-4/+42
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix the example given in the documentation for TimeWithZone#-Phil Ross2015-10-291-4/+4
| * | | | Add documentation for TimeWithZone #ago and #advance.Phil Ross2015-10-291-0/+38
* | | | | Never pass `nil` to `order`Sean Griffin2015-10-295-22/+7
* | | | | 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
|\ \ \ \ \ \ \ \ \