aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge pull request #29634 from kamipo/dont_cache_queries_for_schema_statementsMatthew Draper2017-07-0110-55/+70
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Don't cache queries for schema statementsRyuta Kamizono2017-06-3010-55/+70
* | | | | | | | | | | | Merge pull request #29644 from wilson/unify-route-helper-visibilityMatthew Draper2017-07-012-18/+17
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Properly register "custom" URL helpers as named helpers.Wilson Bilkovich2017-06-302-18/+16
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #28808 from fschwahn/fix-polymorphic-automic-inverseMatthew Draper2017-07-013-10/+19
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add regression test for setting inverse instances on normal & polymorphic rel...Fabian Schwahn2017-04-201-0/+14
| * | | | | | | | | | | | Remove :polymorphic from INVALID_AUTOMATIC_INVERSE_OPTIONSFabian Schwahn2017-04-202-10/+5
* | | | | | | | | | | | | Merge pull request #29536 from nickrivadeneira/fix-yamlMatthew Draper2017-07-012-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Ensure `false` is preserved in attr serializationNick Rivadeneira2017-06-222-1/+9
| | | | | | | | | | | | * | [Action Cable] require => require_relativeAkira Matsuda2017-07-013-3/+3
| | | | | | | | | | | | * | [Active Job] require => require_relativeAkira Matsuda2017-07-014-13/+13
| | | | | | | | | | | | * | [Action Mailer] require => require_relativeAkira Matsuda2017-07-012-4/+4
| | | | | | | | | | | | * | [Action View] require => require_relativeAkira Matsuda2017-07-0125-35/+35
| | | | | | | | | | | | * | [Action Pack] require => require_relativeAkira Matsuda2017-07-011-1/+1
| | | | | | | | | | | | * | [Action Controller] require => require_relativeAkira Matsuda2017-07-017-9/+9
| | | | | | | | | | | | * | [Abstract Controller] require => require_relativeAkira Matsuda2017-07-012-2/+2
| | | | | | | | | | | | * | [Action Dispatch] require => require_relativeAkira Matsuda2017-07-0127-57/+57
| | | | | | | | | | | | * | [Active Record] require => require_relativeAkira Matsuda2017-07-0135-135/+135
| | | | | | | | | | | | * | [Active Model] require => require_relativeAkira Matsuda2017-07-017-23/+23
| | | | | | | | | | | | * | [Active Support] require => require_relativeAkira Matsuda2017-07-01129-383/+383
| | | | | | | | | | | | * | [Railties] require => require_relativeAkira Matsuda2017-07-0171-107/+107
| |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #29629 from koic/fix_next_version_of_railsMatthew Draper2017-07-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix the next version of Rails from 5.3 to 6.0Koichi ITO2017-06-301-1/+1
* | | | | | | | | | | | | | Merge pull request #29646 from y-yagi/fix_format_of_ap_to_sRyuta Kamizono2017-07-011-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix format of `ActionController::Parameters#to_s` doc [ci skip]yuuji.yaginuma2017-07-011-0/+1
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #29643 from fatkodima/delete_stale_commentRyuta Kamizono2017-07-011-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Delete stale comment for `AR::Associations::Builder::CollectionAssociation`fatkodima2017-07-011-2/+0
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Add CHANGELOG for #29630 [ci skip]Prathamesh Sonpatki2017-07-011-0/+4
* | | | | | | | | | | | | Merge pull request #29630 from kirs/fallback-tos_parametersRafael França2017-06-303-1/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fallback Parameters#to_s to Hash#to_sKir Shatrov2017-06-303-1/+19
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #29418 from dinahshi/scaffold_system_testsEileen M. Uchitelle2017-06-307-13/+104
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Add system tests to generate scaffoldDinah Shi2017-06-307-13/+104
* | | | | | | | | | | | | Merge pull request #29640 from sai29/getting_started_editVipul A M2017-06-301-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | [ci skip] run migration before looking at schemaSai Prashanth2017-06-301-2/+2
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #29618 from diasjorge/patch-1Rafael França2017-06-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Specify correct extension for text layoutsJorge Dias2017-06-291-1/+1
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #29623 from kamipo/should_use_same_connection_in_query_cacheRafael França2017-06-293-11/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Should use the same connection in using query cacheRyuta Kamizono2017-06-293-11/+5
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #29628 from kamipo/fix_next_version_of_railsRafael França2017-06-291-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix the next version of Rails from 5.3 to 6.0Ryuta Kamizono2017-06-291-2/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #29619 from kamipo/deprecate_delegating_to_arel_in_relationKasper Timm Hansen2017-06-293-0/+21
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Deprecate delegating to `arel` in `Relation`Ryuta Kamizono2017-06-293-0/+21
|/ / / / / / / / /
* | | | | | | | | Merge pull request #29616 from kamipo/remove_unused_aliased_table_nameRafael França2017-06-292-9/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove unused `aliased_table_name` in `Association`Ryuta Kamizono2017-06-292-9/+0
* | | | | | | | | | Merge pull request #29569 from kamipo/fix_to_scoping_is_correctly_restoredRafael França2017-06-293-4/+14
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix to scoping is correctly restoredRyuta Kamizono2017-06-293-4/+14
* | | | | | | | | | Merge pull request #28932 from kamipo/remove_method_missing_in_relation_deleg...Rafael França2017-06-281-10/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove `method_missing` in `Relation::Delegation`Ryuta Kamizono2017-04-301-10/+0
* | | | | | | | | | | Merge pull request #29612 from kamipo/use_quote_method_rather_than_single_quoteRafael França2017-06-285-13/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use `quote` method rather than single quotes to identifiers in SQLRyuta Kamizono2017-06-295-13/+12