aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #35236 from renuo/fix-30467Rafael França2019-03-273-0/+29
|\ \ \ \ | | | | | | | | | | Prohibit sneaky custom params from being drawn (Fix #30467)
| * | | | Raise if resource custom params contain colonsJosua Schmid2019-03-263-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After this change it's not possible anymore to configure routes like this: routes.draw do resources :users, param: "name/:sneaky" end Fixes #30467.
* | | | | Merge pull request #35496 from bogdan/right-preloadingRyuta Kamizono2019-03-284-64/+99
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fix preloader to never reset associations in case they are already loaded
| * | | | Fix preloader to never reset associations in case they are already loadedBogdan Gusiev2019-03-074-64/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the issue when association is preloaded with a custom preload scope which disposes the already preloaded target of the association by reseting it. When custom preload scope is used, the preloading is now performed into a separated Hash - #records_by_owner instead of the association. It removes the necessaty the reset the association after the preloading is complete so that reset of the preloaded association never happens. Preloading is still happening to the association when the preload scope is empty.
* | | | | Merge pull request #35556 from bdewater/fast-secure-compareMatthew Draper2019-03-281-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Stop encoding in secure_compare for speedup
| * | | | | Don't encode in secure_compare for speedupBart de Water2019-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Hex encoding is base 16 which makes the original input twice as big. With this change less time need to be spent in fixed_length_secure_compare.
* | | | | | Don't change `collation_connection` in the current connectionRyuta Kamizono2019-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have a test case for `collation_connection` session variable, so it should not be changed in any other test. Fixes #35458.
* | | | | | Merge pull request #35758 from Shigeyuki-fukuda/aligned_order_of_argumentRafael França2019-03-261-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Aligned the order of the arguments of render_template and render_with_layout
| * | | | | Aligned the order of the arguments of render_template and render_with_layoutShigeyuki-fukuda2019-03-271-2/+2
| | | | | |
* | | | | | Schema version documentation (#35762)Ken Greeff2019-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update active_record_migrations.md * Change year to match others [Ken Greeff + Rafael Mendonça França]
* | | | | | Merge pull request #35761 from koic/bump_rubocop_to_0_66_0Ryuta Kamizono2019-03-273-13/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | Bump RuboCop to 0.66.0
| * | | | | | Bump RuboCop to 0.66.0Koichi ITO2019-03-273-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ### Summary RuboCop 0.66.0 has been released. https://github.com/rubocop-hq/rubocop/releases/tag/v0.66.0 And rubocop-0-66 channel is available in Code Climate. https://github.com/codeclimate/codeclimate/releases/tag/v0.84.0 RuboCop 0.66.0 fixed the false negative to indentation for modifier. And this PR applied the auto-correction fixed by it. https://github.com/rubocop-hq/rubocop/pull/6792 In addtion, this PR is also updating the following 4 gems that RuboCop depends on. - Update Psych gem ... https://github.com/rubocop-hq/rubocop/pull/6766 - Update Parser gem to 2.6.2.0 that supports Ruby 2.5.5 and 2.6.2 ... https://github.com/whitequark/parser/blob/v2.6.2.0/CHANGELOG.md#changelog - Remove powerpack gem ... https://github.com/rubocop-hq/rubocop/pull/6806 - Update unicode-display_width gem ... https://github.com/rubocop-hq/rubocop/pull/6813
* | | | | | | Merge pull request #35753 from Edouard-chin/ec-mimetype-rescueRafael França2019-03-265-3/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add the `Mime::Type::InvalidMimeType` error in the default rescue_response:
| * | | | | | | Add the `Mime::Type::InvalidMimeType` error in the default rescue_response:Edouard CHIN2019-03-265-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - https://github.com/rails/rails/pull/35604 introduced a vulnerability fix to raise an error in case the `HTTP_ACCEPT` headers contains malformated mime type. This will cause applications to throw a 500 if a User Agent sends an invalid header. This PR adds the `InvalidMimeType` in the default `rescue_responses` from the ExceptionWrapper and will return a 406. I looked up the HTTP/1.1 RFC and it doesn't stand what should be returned when the UA sends malformated mime type. Decided to get 406 as it seemed to be the status the better suited for this.
* | | | | | | | Merge pull request #35760 from jhawthorn/deprecate_custom_resolver_patternsRafael França2019-03-262-40/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Deprecate custom patterns for PathResolver
| * | | | | | | | Deprecate custom patterns for PathResolverJohn Hawthorn2019-03-262-40/+15
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Custom glob patterns tie the implementation (Using Dir.glob) to the API we provide. It also doesn't really work. extract_handler_and_format_and_variant expects the handler, format, and variant to be at the end of the template path, and in the same order as they are in the default pattern. This deprecates specifying a custom path for FileSystemResolver and removes the pattern argument of OptimizedFileSystemResolver#initialize, which does not work with a custom pattern.
* | | | | | | | includes bootsnap 1.4.2-java in Gemfile.lockXavier Noria2019-03-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was just pushed.
* | | | | | | | bumps Zeitwerk and BootsnapXavier Noria2019-03-265-13/+16
| | | | | | | |
* | | | | | | | Remove useless = [ci skip]Prathamesh Sonpatki2019-03-261-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #31442 from ebeigarts/weak_descendants_trackerMatthew Draper2019-03-273-4/+64
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Use weak references in descendants tracker
| * | | | | | Use weak references in descendants trackerEdgars Beigarts2019-03-263-4/+64
| |/ / / / / | | | | | | | | | | | | | | | | | | It allows anonymous subclasses to be garbage collected.
* | | | | | Merge pull request #35756 from sergioro9/patch-1Xavier Noria2019-03-261-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Grammar error
| * | | | | | Spelling errorSergio2019-03-261-1/+1
|/ / / / / /
* | | | | | Merge pull request #35743 from ↵Vipul A M2019-03-261-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | soartec-lab/update_guide_active_support_deprecation_silenced Add default value `ActiveSupport::Deprecation.silenced` [ci skip]
| * | | | | | Add default value `ActiveSupport::Deprecation.silenced` [ci skip]soartec-lab2019-03-251-1/+1
| |/ / / / /
* | | | | | Fix CI failure due to remaining tagging recordsRyuta Kamizono2019-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `TRUNCATE TABLE posts` also resets `AUTO_INCREMENT`. If newly created a post, it is wrongly associated with remaining tagging records. To un-associate remaining tagging record, use `post.create_tagging!` instead. Fixes #35751.
* | | | | | Merge pull request #35754 from yahonda/diag35665Ryuta Kamizono2019-03-261-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Use `assert_queries(0)` instead of `assert_no_queries`
| * | | | | Use `assert_queries(0)` instead of `assert_no_queries` to ignore metadata ↵Yasuo Honda2019-03-261-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | queries Fix #35665 ```ruby $ ARCONN=mysql2 bin/test test/cases/scoping/named_scoping_test.rb test/cases/tasks/database_tasks_test.rb test/cases/associations/cascaded_eager_loading_test.rb test/cases/associations/eager_singularization_test.rb -n "/^(?:NamedScopingTest#(?:test_many_should_not_fire_query_if_scope_loaded)|ActiveRecord::DatabaseTasksDumpSchemaCacheTest#(?:test_dump_schema_cache)|CascadedEagerLoadingTest#(?:test_eager_association_loading_with_has_many_sti_and_subclasses)|EagerSingularizationTest#(?:test_eager_no_extra_singularization_has_many_through_belongs_to))$/" --seed 16818 Using mysql2 Run options: -n "/^(?:NamedScopingTest#(?:test_many_should_not_fire_query_if_scope_loaded)|ActiveRecord::DatabaseTasksDumpSchemaCacheTest#(?:test_dump_schema_cache)|CascadedEagerLoadingTest#(?:test_eager_association_loading_with_has_many_sti_and_subclasses)|EagerSingularizationTest#(?:test_eager_no_extra_singularization_has_many_through_belongs_to))$/" --seed 16818 ...F Failure: CascadedEagerLoadingTest#test_eager_association_loading_with_has_many_sti_and_subclasses [/home/yahonda/git/rails/activerecord/test/cases/associations/cascaded_eager_loading_test.rb:124]: 1 instead of 0 queries were executed. Queries: SHOW FULL FIELDS FROM `topics`. Expected: 0 Actual: 1 bin/test test/cases/associations/cascaded_eager_loading_test.rb:119 Finished in 6.894609s, 0.5802 runs/s, 1.0153 assertions/s. 4 runs, 7 assertions, 1 failures, 0 errors, 0 skips $ ```
* | | | | Merge pull request #35740 from sharang-d/change-test-wordingRyuta Kamizono2019-03-251-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Reword test names in credentials_test.rb
| * | | | | Reword test names in credentials_test.rbSharang Dashputre2019-03-251-4/+4
| | | | | |
* | | | | | Merge pull request #35741 from chiraggshah/patch-1Vipul A M2019-03-251-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] Fixed typo in CHANGELOG.md
| * | | | | | [ci skip] Fixed typoChirag Shah2019-03-251-1/+1
|/ / / / / /
* | | | | | Merge pull request #35739 from sharang-d/unique_by-changesVipul A M2019-03-251-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Format 'RETURNING' text in the docs [ci skip]
| * | | | | Format 'RETURNING' text in the docs [ci skip]Sharang Dashputre2019-03-251-3/+3
|/ / / / /
* | | | | Cleanup guide for configuring config.disable_sandbox and related changelog ↵Vipul A M2019-03-252-3/+3
| | | | | | | | | | | | | | | | | | | | [ci skip] (#35733)
* | | | | Merge pull request #35732 from rails/webdriversGuillermo Iguaran2019-03-245-13/+13
|\ \ \ \ \ | | | | | | | | | | | | Replace chromedriver-helper with webdrivers
| * | | | | Use webdrivers instead of chromedriver-helper in new appsGuillermo Iguaran2019-03-242-4/+4
| | | | | |
| * | | | | Use webdrivers instead of chromedriver-helper for AV UJS testsGuillermo Iguaran2019-03-243-9/+9
| | | | | |
* | | | | | Merge pull request #35723 from sikachu/disable-sandbox-flagGuillermo Iguaran2019-03-247-5/+54
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add config.disable_sandbox option to Rails console
| * | | | | Add config.disable_sandbox option to Rails consolePrem Sichanugrist2019-03-237-5/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A long-running `rails console --sandbox` could cause a database server to become out-of-memory as it's holding on to changes that happen on the database. Given that it's common for Ruby on Rails application with huge traffic to have separate write database and read database, we should allow the developers to disable this sandbox option to prevent someone from accidentally causing the Denial-of-Service on their server.
* | | | | | Merge pull request #35690 from soartec-lab/update_guide_sending_log_messagesRyuta Kamizono2019-03-241-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add `unknown` method to list of methods to write current log [ci skip]
| * | | | | | Add `unknown` method to list of methods to write current log [ci skip]soartec-lab2019-03-211-1/+1
| | | | | | |
* | | | | | | Merge pull request #35724 from ↵Ryuta Kamizono2019-03-241-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | soartec-lab/update_guide_raise_on_missing_translations_default Add default `config.action_view.raise_on_missing_translations` [ci skip]
| * | | | | | | Add default `config.action_view.raise_on_missing_translations` [ci skip]soartec-lab2019-03-241-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #35718 from ↵Yuji Yaginuma2019-03-242-2/+24
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | y-yagi/add_secret_key_base_when_creating_new_credentials Add `secret_key_base` when creating new credential file
| * | | | | | | Add `secret_key_base` when creating new credential fileyuuji.yaginuma2019-03-232-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since `secret_key_base` is expected to be included in credential file, `secret_key_base` should be included even if re-create the file. This is the same behavior as creating a new app. When env is specified, it may be unnecessary, so I added it only when not specifying env.
* | | | | | | | Avoid creating ActionText::RichText records unnecessarilyGeorge Claghorn2019-03-232-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assigning a has_one association for a persisted record saves the change immediately, so attempting to read a rich-text attribute on a persisted record without a corresponding ActionText::RichText would eagerly create one. Avoid assigning the rich text association to fix.
* | | | | | | | Depend on Zeitwerk 1.4.2Xavier Noria2019-03-232-3/+3
| | | | | | | |
* | | | | | | | Merge pull request #35683 from Kukunin/masterRyuta Kamizono2019-03-232-7/+38
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Bugfix: Fix false autosave for has_one :through association
| * | | | | | | | Fix unintended autosave on has_one through associationSergiy Kukunin2019-03-222-7/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #35680 The problem occurred, when a `has one through` association contains a foreign key (it belongs to the intermediate association). For example, Comment belongs to Post, Post belongs to Author, and Author `has_one :first_comment, through: :first_post`. In this case, the value of the foreign key is comparing with the original record, and since they are likely different, the association is marked as changed. So it updates every time when the origin record updates.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 06:15:34 +0000