aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Allow format to be nilJohn Hawthorn2019-02-261-5/+0
* Merge pull request #35397 from bogdanvlviv/run-memcachestoretest-on-buildkiteMatthew Draper2019-02-273-14/+15
|\
| * Run activesupport's memcache store tests on Buildkitebogdanvlviv2019-02-263-14/+15
|/
* Fix preload with nested associationsRafael Mendonça França2019-02-263-1/+16
* :scissors:Ryuta Kamizono2019-02-271-1/+1
* Add negative scopes for all enum values (#35381)David Heinemeier Hansson2019-02-263-0/+25
* Merge pull request #35422 from ricardotk002/fix-indentation-ad-routingRafael França2019-02-261-4/+4
|\
| * Fix code examples' indentation in ActionDispatch::Routing [ci skip]Ricardo Díaz2019-02-261-4/+4
* | Merge pull request #35411 from rails/pass-locals-to-templateAaron Patterson2019-02-268-56/+47
|\ \ | |/ |/|
| * Remove unused method / fix documentationAaron Patterson2019-02-261-6/+1
| * Update actionview/lib/action_view/template/resolver.rbJohn Hawthorn2019-02-261-1/+1
| * `original_encoding` isn't used, so deprecate it and remove the ivarAaron Patterson2019-02-252-5/+5
| * Expand key word args for ActionView::TemplateAaron Patterson2019-02-252-4/+4
| * Don't mutate `virtual_path`, remove `decorate`Aaron Patterson2019-02-252-17/+4
| * Pass locals in to the template object on constructionAaron Patterson2019-02-257-27/+36
* | Don't cache `find_by` statements on STI subclassesRyuta Kamizono2019-02-273-5/+22
* | Test that no datetime precision isn't truncated on assignmentRyuta Kamizono2019-02-272-1/+41
* | Merge pull request #35412 from abhchand/correctly-load-blob-associationGeorge Claghorn2019-02-263-0/+7
|\ \
| * | [ActiveStorage] Ensure that the `_blob` association is properly loaded when a...Abhishek Chandrasekhar2019-02-263-0/+7
* | | Fix random CI failure due to non-deterministic sorting orderRyuta Kamizono2019-02-271-5/+5
* | | Merge pull request #35361 from jvillarejo/fix_wrong_size_query_with_distinct_...Ryuta Kamizono2019-02-274-3/+40
|\ \ \
| * | | fixes different `count` calculation when using `size` manual `select` with DI...jvillarejo2019-02-264-3/+39
|/ / /
* | | Merge pull request #35414 from abhaynikam/35406-followup-rename-template-formatRafael França2019-02-251-1/+1
|\ \ \ | |_|/ |/| |
| * | [ci skip] Renamed formats -> format in test after #35406Abhay Nikam2019-02-261-1/+1
|/ /
* | Merge pull request #35408 from rails/template-has-one-variantAaron Patterson2019-02-253-13/+11
|\ \
| * | Change `variants` to `variant`Aaron Patterson2019-02-252-11/+10
| * | Remove potential `variants` mutation in `decorate`Aaron Patterson2019-02-251-1/+0
| * | Convert `variant` to a keyword argAaron Patterson2019-02-251-2/+2
* | | Preparing for 6.0.0.beta2 releaseRafael Mendonça França2019-02-2532-68/+109
* | | Improve Template#inspect output (#35407)John Hawthorn2019-02-252-2/+16
|/ /
* | Merge pull request #35406 from rails/template-has-one-formatAaron Patterson2019-02-2516-31/+43
|\ \
| * | Templates have one formatAaron Patterson2019-02-2516-31/+43
* | | Merge pull request #35400 from aglushkov/stream_manual_cache_controlAaron Patterson2019-02-252-2/+8
|\ \ \ | |/ / |/| |
| * | Allow custom cache-control header in AC::LiveAndrey Glushkov2019-02-252-2/+8
* | | Merge pull request #35404 from rails/no-nil-format-on-templatesAaron Patterson2019-02-256-16/+33
|\ \ \
| * | | Update actionview/lib/action_view/template.rbRyuta Kamizono2019-02-251-1/+1
| * | | remove the formats writer on templatesAaron Patterson2019-02-251-2/+6
| * | | Dereference the format type before template constructionAaron Patterson2019-02-252-2/+2
| * | | Always pass a format to the ActionView::Template constructorAaron Patterson2019-02-256-13/+26
|/ / /
* | | Fix class name in the documentation [ci skip]Rafael Mendonça França2019-02-251-1/+1
* | | Merge pull request #35402 from alimi/update-ar-read-regexAaron Patterson2019-02-254-1/+29
|\ \ \
| * | | Update READ_QUERY regexAli Ibrahim2019-02-254-1/+29
* | | | Depend on bootsnap 1.4.1Rafael Mendonça França2019-02-251-1/+1
| |_|/ |/| |
* | | Refactor `type_to_sql` to handle converting `limit` to `size` in itselfRyuta Kamizono2019-02-266-76/+91
* | | Merge pull request #35399 from kamipo/fix_prepared_statement_cachingRyuta Kamizono2019-02-265-15/+79
|\ \ \ | |/ / |/| |
| * | Fix prepared statements caching to be enabled even when query caching is enabledRyuta Kamizono2019-02-265-15/+79
|/ /
* | Merge pull request #35394 from alkesh26/activemodel-typo-fixRyuta Kamizono2019-02-251-3/+3
|\ \
| * | activemodel typo fix.alkesh262019-02-251-3/+3
* | | Merge pull request #35352 from kamipo/update_all_doesnt_care_optimistic_lockingRyuta Kamizono2019-02-254-19/+83
|\ \ \ | |/ / |/| |
| * | Ensure `update_all` series cares about optimistic lockingRyuta Kamizono2019-02-254-19/+83