aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #26587 from utilum/active_job_serialize_provider_job_idRafael França2017-06-272-0/+9
|\
| * ActiveJob::Core#serialize stores provider_job_id (fixes #26581).utilum2017-06-272-0/+9
* | Merge pull request #29583 from amingilani/ignore-assetsRafael França2017-06-271-0/+4
|\ \
| * | Ignore public/assetsamingilani2017-06-271-0/+4
| |/
* | Merge pull request #29587 from kamipo/skip_instantiating_null_preloaderRafael França2017-06-271-11/+3
|\ \ | |/ |/|
| * Skip instantiating `NullPreloader` if `assoc.klass` is nilRyuta Kamizono2017-06-271-11/+3
|/
* Merge pull request #29571 from kamipo/fix_extracting_references_via_order_valuesRafael França2017-06-262-1/+7
|\
| * Fix extracting `references` via `order_values` to respect quotingRyuta Kamizono2017-06-262-1/+7
* | Merge pull request #29557 from kamipo/extract_build_scope_and_predicate_builderRafael França2017-06-263-20/+21
|\ \
| * | Move constructing join scope to `Reflection`Ryuta Kamizono2017-06-262-13/+12
| * | Extract `build_scope` and `predicate_builder` in `Reflection`Ryuta Kamizono2017-06-243-12/+14
* | | Merge pull request #29568 from kamipo/ensure_using_correct_alias_trackerRafael França2017-06-265-15/+20
|\ \ \
| * | | Ensure that using correct alias trackerRyuta Kamizono2017-06-252-1/+2
| * | | The AliasTracker#aliased_table_for needs the type caster for the joined assoc...Ray Zane2017-06-253-14/+18
| | |/ | |/|
* | | Merge pull request #29560 from fatkodima/remove_unnecessary_tap_callRafael França2017-06-261-1/+1
|\ \ \
| * | | Remove unnecessary `tap` call on `ActionDispatch::MiddlewareStack` instancefatkodima2017-06-241-1/+1
* | | | Merge pull request #29581 from ydakuka/patch-1Eileen M. Uchitelle2017-06-261-1/+1
|\ \ \ \
| * | | | Update security.mdYauheni Dakuka2017-06-261-1/+1
|/ / / /
* | | | Merge pull request #29576 from ttanimichi/add-railtie-rbRafael França2017-06-265-2/+20
|\ \ \ \
| * | | | Add `railtie.rb` to the plugin generatorTsukuru Tanimichi2017-06-265-2/+20
| | |/ / | |/| |
* | | | Merge pull request #29511 from jhawthorn/clear_offsets_cache_on_collection_proxyRafael França2017-06-262-0/+36
|\ \ \ \
| * | | | Move clearing of @offsets cache to reset_scopeJohn Hawthorn2017-06-212-14/+22
| * | | | Clear offset cache on CollectionProxy reset/reloadJohn Hawthorn2017-06-202-0/+28
* | | | | Merge pull request #29519 from Edouard-chin/ec-structure-flags-orderRafael França2017-06-262-4/+4
|\ \ \ \ \
| * | | | | PR ReviewEdouard CHIN2017-06-211-2/+2
| * | | | | pass `structure_dump_flags` / `structure_load_flags` options before any other:Edouard CHIN2017-06-212-4/+4
* | | | | | Merge pull request #29579 from y-yagi/remove_needless_gitignoreGuillermo Iguaran2017-06-261-1/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Remove needless gitignoreyuuji.yaginuma2017-06-261-1/+0
|/ / / / /
* | | | | Merge pull request #29561 from samphippen/samphippen/add-option-to-silence-pu...Sean Griffin2017-06-241-1/+12
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add an option to silence puma in system tests.Sam Phippen2017-06-241-1/+12
|/ / / /
* | | | Merge pull request #29553 from eugeneius/wrap_parameters_nilKasper Timm Hansen2017-06-242-1/+9
|\ \ \ \
| * | | | Don't wrap parameters if key already existsEugene Kenny2017-06-242-1/+9
* | | | | Merge pull request #29549 from Edouard-chin/integration-testing-deprecated-me...Kasper Timm Hansen2017-06-241-2/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Removed reference to unexisting methods:Edouard CHIN2017-06-231-2/+1
| |/ / /
* | | | Merge pull request #29555 from ybakos/guides_layouts_and_rendering_minus_lead...Ryuta Kamizono2017-06-241-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Guides: Clarify partial local variable naming.Yong Bakos2017-06-231-1/+1
|/ / /
* | | Merge pull request #29544 from y-yagi/fix_ac_unfiltered_parameters_msgRyuta Kamizono2017-06-231-2/+2
|\ \ \
| * | | Fix typo in `AC::UnfilteredParameters` message [ci skip]yuuji.yaginuma2017-06-231-2/+2
|/ / /
* | | Merge pull request #29524 from y-yagi/do_not_use_private_api_in_bug_report_te...Eileen M. Uchitelle2017-06-222-8/+4
|\ \ \
| * | | Do not use private API in bug report templatesyuuji.yaginuma2017-06-222-8/+4
* | | | Merge pull request #29529 from abraham-chan/fix-hash-conditions-documentationRyuta Kamizono2017-06-221-2/+0
|\ \ \ \
| * | | | Fix hash conditions documentation [ci skip]Abraham Chan2017-06-221-2/+0
* | | | | Merge pull request #29525 from y-yagi/fix_ruby_warningsKasper Timm Hansen2017-06-221-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove unused variableyuuji.yaginuma2017-06-221-1/+1
|/ / / /
* | | | Merge pull request #29513 from kirs/fixture-yaml-fallbackRafael França2017-06-211-5/+4
|\ \ \ \
| * | | | Avoid begin/rescue in fixture quotingKir Shatrov2017-06-201-5/+4
* | | | | Merge pull request #27063 from MaxLap/merge_keep_inner_joinRafael França2017-06-213-5/+40
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Keep INNER JOIN when merging relationsMaxime Lapointe2017-06-203-5/+40
| | |_|/ | |/| |
* / | | Fix call-seq typo s/==/<=>/ [ci skip]Ryuta Kamizono2017-06-211-1/+1
|/ / /
* | | Merge pull request #28914 from bogdanvlviv/fix-touch-with-optimistic-lockingRafael França2017-06-204-3/+33
|\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 04:02:31 +0000