aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #29533 from jdelStrother/missing_url_formatsRichard Schneeman2017-06-272-0/+11
|\
| * Fix missing formats in route-set URLsJonathan del Strother2017-06-232-0/+11
* | Merge pull request #29598 from y-yagi/fix_typo_in_callback_deprecation_msgRichard Schneeman2017-06-271-1/+1
|\ \
| * | Fix typo in callback deprecation messageyuuji.yaginuma2017-06-281-1/+1
|/ /
* | Merge pull request #29518 from ragesoss/masterRafael França2017-06-271-2/+4
|\ \
| * | Add more explicit guidance on how to fix callback deprecationsSage Ross2017-06-231-2/+4
* | | Merge pull request #29551 from Edouard-chin/integration-test-follow-redirectRafael França2017-06-272-1/+13
|\ \ \
| * | | Calling `follow_redirect!` does not reset the `html_document`:Edouard CHIN2017-06-262-1/+13
* | | | Merge pull request #29556 from kamipo/extract_ordered_relationRafael França2017-06-271-12/+11
|\ \ \ \
| * | | | Extract `ordered_relation` in `FinderMethods`Ryuta Kamizono2017-06-241-12/+11
* | | | | Merge pull request #29589 from kamipo/refactor_join_scopeRafael França2017-06-273-54/+21
|\ \ \ \ \
| * | | | | Move building constraint to `join_scope` in `Reflection`Ryuta Kamizono2017-06-272-41/+14
| * | | | | Move constructing polymorphic type to `join_scope` in `Reflection`Ryuta Kamizono2017-06-273-16/+10
* | | | | | Merge pull request #29586 from padi/add_docs_for_postgresql_jsonb_datatype_in_arRafael França2017-06-271-1/+6
|\ \ \ \ \ \
| * | | | | | Document ActiveRecord's PostgreSQL-specific support for JSONB datatype in Rai...Marc Rendl Ignacio2017-06-271-1/+6
| |/ / / / /
* | | | | | Merge pull request #29528 from padi/actioncable_redis_alt_config_with_passwordRafael França2017-06-275-8/+23
|\ \ \ \ \ \
| * | | | | | Adds CHANGELOG for f55ecc6 [ci skip]Marc Rendl Ignacio2017-06-271-0/+9
| * | | | | | Allows for other common redis options to be in cable.yml, by defaultMarc Ignacio2017-06-224-8/+14
* | | | | | | 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