Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | | Merge pull request #26587 from utilum/active_job_serialize_provider_job_id | Rafael França | 2017-06-27 | 2 | -0/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | ActiveJob::Core#serialize stores provider_job_id (fixes #26581). | utilum | 2017-06-27 | 2 | -0/+9 | |
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge pull request #29583 from amingilani/ignore-assets | Rafael França | 2017-06-27 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Ignore public/assets | amingilani | 2017-06-27 | 1 | -0/+4 | |
| |/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | Merge pull request #29587 from kamipo/skip_instantiating_null_preloader | Rafael França | 2017-06-27 | 1 | -11/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Skip instantiating `NullPreloader` if `assoc.klass` is nil | Ryuta Kamizono | 2017-06-27 | 1 | -11/+3 | |
|/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge pull request #29571 from kamipo/fix_extracting_references_via_order_values | Rafael França | 2017-06-26 | 2 | -1/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Fix extracting `references` via `order_values` to respect quoting | Ryuta Kamizono | 2017-06-26 | 2 | -1/+7 | |
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge pull request #29557 from kamipo/extract_build_scope_and_predicate_builder | Rafael França | 2017-06-26 | 3 | -20/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Move constructing join scope to `Reflection` | Ryuta Kamizono | 2017-06-26 | 2 | -13/+12 | |
| * | | | | | | | | | | | | | | | Extract `build_scope` and `predicate_builder` in `Reflection` | Ryuta Kamizono | 2017-06-24 | 3 | -12/+14 | |
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge pull request #29568 from kamipo/ensure_using_correct_alias_tracker | Rafael França | 2017-06-26 | 5 | -15/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Ensure that using correct alias tracker | Ryuta Kamizono | 2017-06-25 | 2 | -1/+2 | |
| * | | | | | | | | | | | | | | | The AliasTracker#aliased_table_for needs the type caster for the joined assoc... | Ray Zane | 2017-06-25 | 3 | -14/+18 | |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge pull request #29560 from fatkodima/remove_unnecessary_tap_call | Rafael França | 2017-06-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Remove unnecessary `tap` call on `ActionDispatch::MiddlewareStack` instance | fatkodima | 2017-06-24 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | Merge pull request #29581 from ydakuka/patch-1 | Eileen M. Uchitelle | 2017-06-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Update security.md | Yauheni Dakuka | 2017-06-26 | 1 | -1/+1 | |
|/ / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | Merge pull request #29576 from ttanimichi/add-railtie-rb | Rafael França | 2017-06-26 | 5 | -2/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Add `railtie.rb` to the plugin generator | Tsukuru Tanimichi | 2017-06-26 | 5 | -2/+20 | |
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge pull request #29511 from jhawthorn/clear_offsets_cache_on_collection_proxy | Rafael França | 2017-06-26 | 2 | -0/+36 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Move clearing of @offsets cache to reset_scope | John Hawthorn | 2017-06-21 | 2 | -14/+22 | |
| * | | | | | | | | | | | | | | | | Clear offset cache on CollectionProxy reset/reload | John Hawthorn | 2017-06-20 | 2 | -0/+28 | |
* | | | | | | | | | | | | | | | | | Merge pull request #29519 from Edouard-chin/ec-structure-flags-order | Rafael França | 2017-06-26 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | PR Review | Edouard CHIN | 2017-06-21 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | pass `structure_dump_flags` / `structure_load_flags` options before any other: | Edouard CHIN | 2017-06-21 | 2 | -4/+4 | |
* | | | | | | | | | | | | | | | | | | Merge pull request #29579 from y-yagi/remove_needless_gitignore | Guillermo Iguaran | 2017-06-26 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Remove needless gitignore | yuuji.yaginuma | 2017-06-26 | 1 | -1/+0 | |
|/ / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | Merge pull request #29561 from samphippen/samphippen/add-option-to-silence-pu... | Sean Griffin | 2017-06-24 | 1 | -1/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Add an option to silence puma in system tests. | Sam Phippen | 2017-06-24 | 1 | -1/+12 | |
|/ / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | Merge pull request #29553 from eugeneius/wrap_parameters_nil | Kasper Timm Hansen | 2017-06-24 | 2 | -1/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Don't wrap parameters if key already exists | Eugene Kenny | 2017-06-24 | 2 | -1/+9 | |
* | | | | | | | | | | | | | | | | | Merge pull request #29549 from Edouard-chin/integration-testing-deprecated-me... | Kasper Timm Hansen | 2017-06-24 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Removed reference to unexisting methods: | Edouard CHIN | 2017-06-23 | 1 | -2/+1 | |
| |/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | Merge pull request #29555 from ybakos/guides_layouts_and_rendering_minus_lead... | Ryuta Kamizono | 2017-06-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Guides: Clarify partial local variable naming. | Yong Bakos | 2017-06-23 | 1 | -1/+1 | |
|/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge pull request #29544 from y-yagi/fix_ac_unfiltered_parameters_msg | Ryuta Kamizono | 2017-06-23 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Fix typo in `AC::UnfilteredParameters` message [ci skip] | yuuji.yaginuma | 2017-06-23 | 1 | -2/+2 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge pull request #29524 from y-yagi/do_not_use_private_api_in_bug_report_te... | Eileen M. Uchitelle | 2017-06-22 | 2 | -8/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Do not use private API in bug report templates | yuuji.yaginuma | 2017-06-22 | 2 | -8/+4 | |
* | | | | | | | | | | | | | | Merge pull request #29529 from abraham-chan/fix-hash-conditions-documentation | Ryuta Kamizono | 2017-06-22 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Fix hash conditions documentation [ci skip] | Abraham Chan | 2017-06-22 | 1 | -2/+0 | |
* | | | | | | | | | | | | | | | Merge pull request #29525 from y-yagi/fix_ruby_warnings | Kasper Timm Hansen | 2017-06-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Remove unused variable | yuuji.yaginuma | 2017-06-22 | 1 | -1/+1 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge pull request #29513 from kirs/fixture-yaml-fallback | Rafael França | 2017-06-21 | 1 | -5/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Avoid begin/rescue in fixture quoting | Kir Shatrov | 2017-06-20 | 1 | -5/+4 | |
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #27063 from MaxLap/merge_keep_inner_join | Rafael França | 2017-06-21 | 3 | -5/+40 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Keep INNER JOIN when merging relations | Maxime Lapointe | 2017-06-20 | 3 | -5/+40 | |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* / | | | | | | | | | | | | Fix call-seq typo s/==/<=>/ [ci skip] | Ryuta Kamizono | 2017-06-21 | 1 | -1/+1 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #28914 from bogdanvlviv/fix-touch-with-optimistic-locking | Rafael França | 2017-06-20 | 4 | -3/+33 | |
|\ \ \ \ \ \ \ \ \ \ \ \ |