aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use `reload` in `test_find_first_after_reload`Ryuta Kamizono2017-06-281-10/+10
| | | | | | | And use `assert_same` instead of `assert_equal` and tiny fix assert message s/#reload/#reset/. Follow up of #29511.
* Merge pull request #29533 from jdelStrother/missing_url_formatsRichard Schneeman2017-06-272-0/+11
|\ | | | | Fix missing formats in route-set URLs
| * Fix missing formats in route-set URLsJonathan del Strother2017-06-232-0/+11
| | | | | | | | | | | | | | | | | | | | | | Before this change, handle_positional_args would end up mutating @segment_keys if inner_options included path components. Subsequent calls would then be missing the implicit path components. eg: user_path(1, :json) # => "/users/1.json" (correct) user_path(1, format: :json) # => "/users/1.json" (correct, but @segment_keys was mutated) user_path(1, :json) # => "/users/1" (oh no!)
* | Merge pull request #29598 from y-yagi/fix_typo_in_callback_deprecation_msgRichard Schneeman2017-06-271-1/+1
|\ \ | | | | | | Fix typo in callback deprecation message
| * | 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 deprecations
| * | Add more explicit guidance on how to fix callback deprecationsSage Ross2017-06-231-2/+4
| | | | | | | | | | | | This deprecation warning message will be more useful if it indicates what the string was doing — being eval'd — and what the non-deprecated options for callback conditionals are.
* | | 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`:
| * | | Calling `follow_redirect!` does not reset the `html_document`:Edouard CHIN2017-06-262-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When making a request to a controller that redirects, `follow_redirect!` would not reset the `html_document` ivar, it only resets the `html_document` ivar from the session (not the runner) - If one was doing something like this; ```ruby get '/redirect' assert_select 'you are being redirected' follow_redirect! # html_document is memoized and doesn't get reset ``` - To fix the issue we can do the same for any other methods (`get`, `post`...) and define a method in the runner that delegates to the session but clears the html_document_first - Fixes #29367
* | | | Merge pull request #29556 from kamipo/extract_ordered_relationRafael França2017-06-271-12/+11
|\ \ \ \ | | | | | | | | | | Extract `ordered_relation` in `FinderMethods`
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Refactor join dependency to move building constraints to `join_scope` in `Reflection`
| * | | | | 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
| * | | | | | Document ActiveRecord's PostgreSQL-specific support for JSONB datatype in ↵Marc Rendl Ignacio2017-06-271-1/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RailsGuides [ci skip]
* | | | | | Merge pull request #29528 from padi/actioncable_redis_alt_config_with_passwordRafael França2017-06-275-8/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allows for other common redis options to be in cable.yml, by default
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Adds RedisAdapterTest::AlternateConfiguration to account for a relatively common alternative setup, as it’s used as the first example in the [Redis rubygem](https://github.com/redis/redis-rb#getting-started) - Supplies original RedisAdapterTest with more complete redis:// url format by adding a ‘userinfo’ (blank user), so that it resembles the alternate configuration - Supplies original EventedRedisAdapterTest with more complete redis:// url as well - Adds before_script to start redis-server with password as a daemon and with explicit defaults copied from the default redis.conf (Instead of using Travis' default init/upstart scripts for `redis` service)
* | | | | | | 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).
| * | | | | | | 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/assets
| * | | | | | | 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 nil
| * | | | | | Skip instantiating `NullPreloader` if `assoc.klass` is nilRyuta Kamizono2017-06-271-11/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Simply we can skip instantiating `NullPreloader` if `assoc.klass` is nil.
* | | | | | 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 quoting
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | Extract `build_scope` and `predicate_builder` in `Reflection`
| * | | | | | 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 tracker
| * | | | | | Ensure that using correct alias trackerRyuta Kamizono2017-06-252-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Covering #27994 in tests. Closes #27994.
| * | | | | | The AliasTracker#aliased_table_for needs the type caster for the joined ↵Ray Zane2017-06-253-14/+18
| | |/ / / / | |/| | | | | | | | | | | | | | | | association, not the join root
* | | | | | Merge pull request #29560 from fatkodima/remove_unnecessary_tap_callRafael França2017-06-261-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove unnecessary `tap` call on `ActionDispatch::MiddlewareStack.new`
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] Add missing space in security.md
| * | | | | | | 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 generator
| * | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Rails 5.1.2.rc1 regression - Clear offset cache on CollectionProxy reset/reload
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `@offsets` cache is used by FinderMethods to cache records found by find_nth. This cache is cleared in AR::Relation#reset, but not in CollectionProxy#reset or CollectionProxy#reload. Because of this, since #29098, calling #first/#find_nth/etc after calling #reload or #reset on an association could return a stale record. This is an issue both when the full association target is loaded and when the item is loaded in #find_nth. This commit solves the problem by clearing the `@offsets` cache in CollectionProxy#reset and CollectionProxy#reload.
* | | | | | | | Merge pull request #29519 from Edouard-chin/ec-structure-flags-orderRafael França2017-06-262-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Pass `structure_dump_flags` / `structure_load_flags` options before any other:
| * | | | | | | | PR ReviewEdouard CHIN2017-06-211-2/+2
| | | | | | | | |
| * | | | | | | | pass `structure_dump_flags` / `structure_load_flags` options before any other:Edouard CHIN2017-06-212-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - On Mysql, some command line options that affect option-file handling such as `--no-defaults` have to be passed before any other options - Modified rails to pass them right after the `mysql` command - Ref https://dev.mysql.com/doc/refman/5.7/en/option-file-options.html and https://bugs.mysql.com/bug.php?id=83386 - Ref #27437
* | | | | | | | | Merge pull request #29579 from y-yagi/remove_needless_gitignoreGuillermo Iguaran2017-06-261-1/+0
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | Remove needless gitignore
| * | | | | | | | Remove needless gitignoreyuuji.yaginuma2017-06-261-1/+0
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dummy application is created under the tmp directory. Nothing is created in the `test/dummy` directory. https://github.com/rails/rails/blob/40bdbce191ad90dfea43dad51fac5c4726b89392/activejob/test/support/integration/helper.rb#L9 I guess that this comment makes it unnecessary. https://github.com/rails/rails/pull/16541#r16986711
* | | | | | | | Merge pull request #29561 from ↵Sean Griffin2017-06-241-1/+12
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | samphippen/samphippen/add-option-to-silence-puma-in-system-test Add an option to silence puma in system tests.
| * | | | | | | Add an option to silence puma in system tests.Sam Phippen2017-06-241-1/+12
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is motivated by our usage of system test in RSpec. Puma lazily boots the first time a system test is used, but this causes some unfortunate output to appear in the middle of the user's green dots. An example of this can be seen in @derekprior's comment [here](https://github.com/rspec/rspec-rails/pull/1813#issuecomment-309252314). There are alternatives in RSpec where we attempt to intercept the puma boot and prevent the output from being made there, but that would involve some monkey patching. This seems like a cleaner solution.
* | | | | | | Merge pull request #29553 from eugeneius/wrap_parameters_nilKasper Timm Hansen2017-06-242-1/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Don't wrap parameters if key already exists
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 13:55:53 +0000