aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* update nokogiriGreg Molnar2018-10-051-4/+4
|
* Merge pull request #34096 from ↵Rafael França2018-10-051-0/+1
|\ | | | | | | | | prathamesh-sonpatki/exclude-node-modules-for-rubocop Skip node_modules dir in the rubocop check
| * Skip node_modules dir in the rubocop checkPrathamesh Sonpatki2018-10-051-0/+1
|/ | | | - Otherwise it is running the check against all files in node_modules
* Merge pull request #34095 from prathamesh-sonpatki/fix-tests-related-to-acGuillermo Iguaran2018-10-054-8/+6
|\ | | | | Fix tests related to new JavaScript path for generators
| * Fix tests related to new JavaScript path for generatorsPrathamesh Sonpatki2018-10-054-8/+6
| | | | | | | | - Followup of https://github.com/rails/rails/commit/4838c1716a0340137d858fab49bf460e23be5a4b
* | Merge pull request #34068 from schneems/schneems/micro-optimize-try-nilRichard Schneeman2018-10-051-2/+2
|\ \ | | | | | | 23% faster Nil#try
| * | This PR speeds up Nil#try by avoiding an allocation when only one argument ↵schneems2018-10-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is passed: ```ruby class FooNew def try(method_name = nil, *args) nil end end class FooOld def try(*args) nil end end require 'benchmark/ips' foo_new = FooNew.new foo_old = FooOld.new Benchmark.ips do |x| x.report("new") { foo_new.try(:anything) } x.report("old") { foo_old.try(:anything) } x.compare! end # Warming up -------------------------------------- # new 250.633k i/100ms # old 232.322k i/100ms # Calculating ------------------------------------- # new 6.476M (± 4.8%) i/s - 32.332M in 5.005777s # old 5.258M (± 3.2%) i/s - 26.485M in 5.042589s # Comparison: # new: 6476002.5 i/s # old: 5257912.5 i/s - 1.23x slower ``` It's worth noting that checking for nil separately as in https://github.com/rails/rails/pull/34067 seems to be MUCH faster. It might be worth it to apply a blanket `&.` to every internal `try` call.
* | | Merge pull request #34092 from bogdanvlviv/follow-up-33968Ryuta Kamizono2018-10-051-0/+5
|\ \ \ | |_|/ |/| | Exercise stringify of database configurations
| * | Exercise stringify of database configurationsbogdanvlviv2018-10-051-0/+5
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Since #33968 we stringify keys of database configuration This commit adds more assertions in order to ensure that and prevent any regression in the future. Currently, if remove `to_s` added in #33968 from `env_name.to_s` on the line (activerecord/lib/active_record/database_configurations.rb:107), there is no test that would fail. One of the added assertions should emphasize why we need this `to_s`. Follow up #33968
* | Merge pull request #34087 from frodsan/application_job_suggestionsYuji Yaginuma2018-10-051-0/+5
|\ \ | | | | | | Add retry_on/discard suggestions for common cases to ApplicationJob for new apps.
| * | Add retry_on/discard suggestions for common cases.Francesco Rodríguez2018-10-051-0/+5
|/ / | | | | | | | | | | | | | | This adds the same suggestions added here: https://github.com/rails/rails/blob/01a69e27a4e55504af8fe776826d659550e6f89e/activejob/lib/rails/generators/job/templates/application_job.rb These appear when `app/jobs/application_job.rb` doesn't exist, but not for new applications.
* | Don't use deprecated `Module#parents`yuuji.yaginuma2018-10-051-1/+1
| |
* | Avoid `webpacker:install` if unnecessaryyuuji.yaginuma2018-10-051-2/+2
| | | | | | | | | | Since this is a test to check the behavior of `load_defaults`, webpacker is unnecessary.
* | Bugfix: ActiveSupport::EncryptedConfiguration reading of comment-only ↵Martin Spickermann2018-10-052-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | encrypted files (#34014) * Fix reading comment only encrypted files When a encrypted file contains only comments then reading that files raises an error: NoMethodError: undefined method `deep_symbolize_keys' for false:FalseClass activesupport/lib/active_support/encrypted_configuration.rb:33:in `config' test/encrypted_configuration_test.rb:52:in `block in <class:EncryptedConfigurationTest>' This happens because the previous implementation returned a `{}` fallback for blank YAML strings. But it did not handle YAML strings that are present but still do not contain any _usefull_ YAML - like the file created by `Rails::Generators::EncryptedFileGenerator` which looks like this: # aws: # access_key_id: 123 # secret_access_key: 345 * Fix coding style violation * Add backwardscompatible with Psych versions that were shipped with Ruby <2.5 * Do not rely on railties for Active Support test * Simplify error handling * Improve test naming * Simplify file creation in test
* | Merge pull request #34083 from bogdanvlviv/follow-up-33953Ryuta Kamizono2018-10-051-1/+1
|\ \ | | | | | | Wrap custom id of a header attribute into \" in rails guides
| * | Wrap custom id of a header attribute into \" in rails guidesbogdanvlviv2018-10-051-1/+1
| | | | | | | | | | | | Related to https://github.com/rails/rails/pull/33953
* | | Remove `ignore_none: false` to assert no queries more strictlyRyuta Kamizono2018-10-057-31/+31
| | | | | | | | | | | | Follow up 811be477786455d144819a5e9fbb7f9f54b8da69.
* | | Use `assert_no_queries` not to ignore BEGIN/COMMIT queriesRyuta Kamizono2018-10-0513-38/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | `test_update_does_not_run_sql_if_record_has_not_changed` would pass without #18501 since `assert_queries` ignores BEGIN/COMMIT unless `ignore_none: true` is given. Since #32647, empty BEGIN/COMMIT is ommited. So we no longer need to use `assert_queries(0)` to ignore BEGIN/COMMIT in the queries.
* | | Simplify the condition in `prepare_update_statement`Ryuta Kamizono2018-10-051-8/+2
| | |
* | | Merge pull request #34064 from ↵Richard Schneeman2018-10-0410-81/+36
|\ \ \ | | | | | | | | | | | | | | | | schneems/schneems/revert-7f870a5ba2aa9177aa4a0e03a9d027928ba60e49 Revert "Merge pull request #33970 from rails/eager-url-helpers"
| * | | Revert "Merge pull request #33970 from rails/eager-url-helpers"schneems2018-10-0310-81/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Until #34050 can be resolved This reverts commit 7f870a5ba2aa9177aa4a0e03a9d027928ba60e49, reversing changes made to 6556898884d636c59baae008e42783b8d3e16440.
* | | | Restore `preloaders_for_one` methodRyuta Kamizono2018-10-051-5/+9
| | | | | | | | | | | | | | | | Since the above comment is for the `preloaders_for_one`.
* | | | failing test for eager loadingMatt Jones2018-10-041-0/+5
| | | | | | | | | | | | | | | | cherry-picked from https://github.com/rails/rails/pull/33763
* | | | Merge pull request #33938 from faucct/bugfix/preload_through_no_recordsEileen M. Uchitelle2018-10-042-28/+29
|\ \ \ \ | | | | | | | | | | ActiveRecord::Associations::Preloader should not fail to preload through missing records
| * | | | ActiveRecord::Associations::Preloader should not fail to preload through ↵Nikita Sokolov2018-10-022-28/+29
| | | | | | | | | | | | | | | | | | | | missing records
* | | | | Merge pull request #34073 from aidanharan/activerecord-regex-escape-table-nameRyuta Kamizono2018-10-041-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Escape table name so that it can be used in regular expression
| * | | | | Escape table name so that it can be used in regular expressionAidan Haran2018-10-041-1/+1
|/ / / / /
* | | | | Merge pull request #34066 from eugeneius/remove_database_warningRyuta Kamizono2018-10-041-15/+1
|\ \ \ \ \ | | | | | | | | | | | | Remove unreachable database warning
| * | | | | Remove unreachable database warningEugene Kenny2018-10-041-15/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `establish_connection` will never raise `ActiveRecord::NoDatabaseError`, because it doesn't connect to a database; it sets up a connection pool.
* | | | | | Merge pull request #33936 from schneems/schneems/cache-micro-optimizationsRichard Schneeman2018-10-041-2/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Decrease memory allocations in cache.rb
| * | | | | Decrease memory allocations in cache.rbschneems2018-09-211-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `merged_options` method is private and the output is never mutated. Using this info we can get rid of the `dup` behavior. We can also eliminate the `merge` call in the case where all the options being merged are the same. Returned results are frozen as an extra layer of protection against mutation. Before ``` Total allocated: 741749 bytes (6642 objects) ``` After ``` Total allocated: 734039 bytes (6648 objects) ``` Diff ``` (741749 - 734039) / 741749.0 => ~ 1.0 % ``` If you don't feel comfortable modifying this method, we could rename it and only use it internally.
* | | | | | Don't use deprecated `LoggerSilence`yuuji.yaginuma2018-10-041-1/+1
| |_|/ / / |/| | | |
* | | | | Merge pull request #34055 from Edouard-chin/ec-logger-fixRafael França2018-10-036-22/+65
|\ \ \ \ \ | | | | | | | | | | | | Fix the LoggerSilence to work as described:
| * | | | | Fix the LoggerSilence to work as described:Edouard CHIN2018-10-026-22/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Following the Rails guide which state that a logger needs to include the `ActiveSupport::LoggerSilence` as well as `ActiveSupport::LoggerThreadSafe` modules isn't enough and won't work. Here is a test cases with 3 tests that all fails https://gist.github.com/Edouard-chin/4a72930c2b1eafbbd72a80c66f102010 The problems are the following: 1) The logger needs to call `after_initialize` in order to setup some instance variables. 2) The silence doesn't actually work because the bare ruby Logger `add` method checks for the instance variable `@logger`. We need to override the `add` (like we used to in the ActiveSupport::Logger class). 3) Calling `debug?` `info?` etc... doesn't work as the bare ruby methods will check for the instance variable. Again we need to override this methods (like we used to in the ActiveSupport::Logger class) The LoggerSilence won't work without LoggerThreadSafe, but the later is not public API, the user shouldn't have to include it so I modified to include it automatically. Same for the `after_initialize` method. I find unuintitive to have to call it directly. I modified to instance the variables when the module get included.
* | | | | | Merge pull request #34063 from bogdanvlviv/fix-rubocop-offense-b707a6d0eb7Rafael França2018-10-031-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix rubocop issue
| * | | | | | Fix rubocop issuebogdanvlviv2018-10-031-1/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: `Layout/TrailingWhitespace: Trailing whitespace detected. See https://codeclimate.com/github/rails/rails/issues Releted to b707a6d0eb7
* | | | | | Merge pull request #34061 from gmcgibbon/fixtures_refactor_fileEileen M. Uchitelle2018-10-033-214/+220
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Move test_fixtures and render_context to separate files
| * | | | | Move test_fixtures and render_context to separate filesGannon McGibbon2018-10-033-214/+220
|/ / / / /
* | | | | Fix the docs for Module#parents and related methods in guides [ci skip]Prathamesh Sonpatki2018-10-031-16/+16
| | | | | | | | | | | | | | | | | | | | - Followup of https://github.com/rails/rails/pull/34051
* | | | | Bring config_accessor's API document back to its lifeAkira Matsuda2018-10-031-1/+1
| | | | | | | | | | | | | | | | | | | | the document has been disappeared since the method became private at c2bfe6cbc8cab9caeab418472a1e12a3ed3e75e2
* | | | | :warning: assigned but unused variable - loggerAkira Matsuda2018-10-031-1/+1
| | | | |
* | | | | Move UPDATE/DELETE with JOIN handling to the Arel sideRyuta Kamizono2018-10-035-106/+92
|/ / / /
* | | | Merge pull request #34051 from gmcgibbon/module_parent_method_renameRafael Mendonça França2018-10-0210-36/+83
|\ \ \ \ | | | | | | | | | | | | | | | Prefix Module#parent, Module#parents, and Module#parent_name with module
| * | | | Fix call sitesGannon McGibbon2018-10-027-12/+12
| | | | |
| * | | | Prefix Module#parent, Module#parents, and Module#parent_name with moduleGannon McGibbon2018-10-023-24/+71
| | | | |
* | | | | Merge pull request #34053 from prathamesh-sonpatki/update-js-docsRafael França2018-10-025-17/+5
|\ \ \ \ \ | | | | | | | | | | | | Update js docs after the webpacker changes
| * | | | | Turbolinks is enabled by default in new apps [ci skip]Prathamesh Sonpatki2018-10-031-4/+0
| | | | | |
| * | | | | Update the docs now that webpacker is default [ci skip]Prathamesh Sonpatki2018-10-034-13/+5
| |/ / / /
* | | | | Merge pull request #34045 from Edouard-chin/ec-logger-silence-namespaceRafael França2018-10-024-14/+41
|\ \ \ \ \ | |/ / / / |/| | | | Deprecate the `LoggerSilence` constant:
| * | | | Deprecate the `LoggerSilence` constant:Edouard CHIN2018-10-024-14/+41
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | - I found this weird that the LoggerSilence wasn't using the `ActiveSupport` namespace (AFAIK all other classes have it). This PR deprecate the use of `LoggerSilence` for `ActiveSupport::LoggerSilence` instead.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 19:05:37 +0000