aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #33175 from gsamokovarov/fix-actionpack-typoRyuta Kamizono2018-06-211-1/+1
|\ | | | | | | | | Fix actionpack changelog typo [ci skip]
| * Fix a typo in the Action Pack changelog [ci skip]Genadi Samokovarov2018-06-191-1/+1
| | | | | | | | I spotted it while working on a PR.
* | Merge pull request #33172 from ↵Yuji Yaginuma2018-06-211-0/+2
|\ \ | | | | | | | | | | | | thomasdziedzic-pd/add-use_authenticated_message_encryption-documentation add documentation for config.active_support.use_authenticated_message_encryption
| * | add documentation for ↵Thomas Dziedzic2018-06-201-0/+2
|/ / | | | | | | | | | | config.active_support.use_authenticated_message_encryption [ci skip] related to https://github.com/rails/rails/issues/33170
* | Remove all `aliases` passing from `JoinDependency`Ryuta Kamizono2018-06-201-2/+2
| | | | | | | | Follow up of 15367a2c674bf19eeefa12ccb64391bdd50d883d.
* | Remove useless `aliases` argument from `JoinDependency#construct`Ryuta Kamizono2018-06-201-5/+5
| | | | | | | | | | Since `aliases` is a part of `JoinDependency` and already cached at 1a723c65bbe91ad969b67416233d20eff6d2a46a.
* | Remove unused `rs` argument from `JoinDependency#construct`Ryuta Kamizono2018-06-201-5/+5
|/ | | | It was no longer used since d7ddaa530fd1b94e22d745cbaf2e8a5a34ee9734.
* Convert hashes into parameters (#33076)Kevin Sjöberg2018-06-192-10/+29
| | | | | | | | | | | | * Convert hashes into parameters Ensure `ActionController::Parameters#transform_values` and `ActionController::Parameters#transform_values!` converts hashes into parameters. * fixup! Convert hashes into parameters [Rafael Mendonça França + Kevin Sjöberg]
* Merge pull request #33074 from lsylvester/optimize-pluckRafael França2018-06-192-5/+26
|\ | | | | Reduce Memory Allocation when using .pluck
| * Avoid creating temporary arrays in ActiveRecord::Result#cast_values in order ↵Lachlan Sylvester2018-06-192-5/+26
| | | | | | | | to speed up pluck
* | Merge pull request #33158 from bogdan/cleanup-habtm-builderRyuta Kamizono2018-06-191-37/+16
|\ \ | | | | | | Removed useless utility classes inside HABTM association builder
| * | Removed useless utility classes inside HABTM association builderBogdan Gusiev2018-06-191-37/+16
| |/
* | Ensure to calculate column aliases after all table aliases are constructedRyuta Kamizono2018-06-1910-90/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, column aliases which is used for eager loading are calculated before constructing all table aliases in FROM clause. `JoinDependency#join_constraints` constructs table aliases for `joins` first, and then always re-constructs table aliases for eager loading. If both `joins` and eager loading are given a same table association, the re-construction would cause the discrepancy between column aliases and table aliases. To avoid the discrepancy, the column aliases should be calculated after all table aliases are constructed. Fixes #30603.
* | Merge pull request #33134 from dasch/dasch/extra-cache-controlsEileen M. Uchitelle2018-06-193-2/+28
|\ \ | |/ |/| Add support for more HTTP cache controls
| * Add support for more HTTP cache controlsDaniel Schierbeck2018-06-133-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From <https://tools.ietf.org/html/rfc5861>: > The stale-if-error HTTP Cache-Control extension allows a cache to > return a stale response when an error -- e.g., a 500 Internal Server > Error, a network segment, or DNS failure -- is encountered, rather > than returning a "hard" error. This improves availability. > > The stale-while-revalidate HTTP Cache-Control extension allows a > cache to immediately return a stale response while it revalidates it > in the background, thereby hiding latency (both in the network and on > the server) from clients. These are useful, fully standardized parts of the HTTP protocol with widespread support among CDN vendors. Supporting them will make it easier to utilize reverse proxies and CDNs from Rails.
* | Merge pull request #33152 from bogdanvlviv/fix-ruby-version-fileRafael França2018-06-182-2/+8
|\ \ | | | | | | Fix Ruby version in `.ruby-version`
| * | Fix Ruby version in `.ruby-version`bogdanvlviv2018-06-182-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since #30016 Rails generates `.ruby-version` file in order to help Ruby version manager tools like `rbenv`, `rvm` determine which Ruby version should be used for the current Rails project. Since #32649 Rails sets Ruby version to the file compatible with MRI/JRuby by default. Pull Request #31496 reports that `.ruby-version` doesn't match ruby version other than stable version and recommends to use `ENV["RBENV_VERSION"]`, and `ENV["rvm_ruby_string"]` in order to set correct Ruby version to the file that `rbenv` or `rvm` can understand. Also, there is another similar issue that reports the same case if use JRuby https://github.com/jruby/jruby/issues/5144. Closes #31496, https://github.com/jruby/jruby/issues/5144.
* | | Merge pull request #33150 from vaidehijoshi/test-journey-or-tokenEileen M. Uchitelle2018-06-181-0/+6
|\ \ \ | | | | | | | | Add test case for the `|` token in Journey scanner
| * | | Add test case for the `|` token in Journey scannervaidehijoshi2018-06-181-0/+6
|/ / / | | | | | | | | | | | | | | | | | | Journey's scanner tokenizes the `|` (:OR) operator when scanning route urls such as `"/:foo|*bar"`. However, the current scanner test does not have any test cases for the `|` operator. This commit adds a test case for this particular token.
* | | Merge pull request #33147 from nsgc/add-api-document-about-migration-methodsRyuta Kamizono2018-06-181-0/+5
|\ \ \ | | | | | | | | Add docs for ActiveRecord::Migration#say, #say_with_time, #suppress_messages [ci skip]
| * | | Add docs for ActiveRecord::Migration#say, #say_with_time, #suppress_messages ↵Naoki Nishiguchi2018-06-181-0/+5
| | | | | | | | | | | | | | | | [ci skip]
* | | | Fix `touch` option to behave consistently with `Persistence#touch` methodRyuta Kamizono2018-06-1810-51/+98
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `touch` option was added to `increment!` (#27660) and `update_counters` (#26995). But that option behaves inconsistently with `Persistence#touch` method. If `touch` option is passed attribute names, it won't update update_at/on attributes unlike `Persistence#touch` method. Due to changed from `Persistence#touch` to `increment!` with `touch` option, #31405 has a regression that `counter_cache` with `touch` option which is passed attribute names won't update update_at/on attributes. I think that the inconsistency is not intended. To get back consistency, ensure that `touch` option updates update_at/on attributes.
* / / Remove unused requireyuuji.yaginuma2018-06-181-1/+0
|/ / | | | | | | `optparse` is unused since #26977.
* | Fix "warning: Net::HTTPResponse#header is obsolete"yuuji.yaginuma2018-06-171-1/+1
| | | | | | | | Ref: https://github.com/ruby/ruby/blob/cc77a811298bd7ab1c422f7f999b93c858327da9/lib/net/http/response.rb#L138-L155
* | Fix Active Storage configuration example [ci skip]yuuji.yaginuma2018-06-161-2/+2
| | | | | | | | It is necessary to specify a value to `config.active_storage`.
* | Merge pull request #33140 from bogdanvlviv/fix-rubocop-violationsYuji Yaginuma2018-06-151-1/+1
|\ \ | | | | | | Fix rubocop violations
| * | Fix rubocop violationsbogdanvlviv2018-06-151-1/+1
|/ / | | | | | | | | | | | | | | https://codeclimate.com/github/rails/rails/issues `bundle exec rubocop -a` Related to e4e1b62007fe40c4277ebc30067837a91bf25967
* | Merge pull request #33136 from Meekohi/masterRafael França2018-06-141-11/+9
|\ \ | | | | | | Update example for whitelisting arbitrary hashes
| * | Update example for whitelisting arbitrary hashesMichael Holroyd2018-06-141-11/+9
|/ / | | | | Since the ability to whitelist arbitrary hashes was added (https://github.com/rails/rails/issues/9454 was resolved by https://github.com/rails/rails/commit/e86524c0c5a26ceec92895c830d1355ae47a7034), this example is no longer outside of what strong_params can do. Moved this specific example out of the "Outside the Scope" section and into the regular "Examples" section, but left the "Outside the Scope" section as it was since the advice is still relevant for weirder whitelisting situations (maybe someone wants to add a new example that can't be handled natively).
* / Add missing documentation about `config.action_mailer.preview_interceptors` ↵yuuji.yaginuma2018-06-141-0/+6
|/ | | | [ci skip]
* Merge pull request #29373 from untidy-hair/store_accessor_enhanceRyuta Kamizono2018-06-135-7/+61
|\ | | | | | | Allow prefix/suffix options for store accessors
| * Update prefix and allow suffix options for store accessorsYukio Mizuta2018-06-124-5/+59
| |
* | Merge pull request #33131 from ↵Ryuta Kamizono2018-06-131-76/+56
|\ \ | | | | | | | | | | | | | | | | | | bogdanvlviv/update-active_support_core_extensions-guide Update "Active Support Core Extensions" Guide [ci skip]
| * | Update "Active Support Core Extensions" Guidebogdanvlviv2018-06-121-76/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove general sentence that explains that all methods that Active Support brings to `Date` `Time`, `DateTime` are defined in `active_support/core_ext/date/calculations.rb` since it isn't true. Add a references to an appropriate file where methods are defined like it is done with the other methods in this guide. Context https://github.com/rails/rails/pull/32552#discussion_r181216246 Related to #32543, #32552 [ci skip]
* | | Add ability to configure cache notifications infoEileen Uchitelle2018-06-122-7/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This may seem like an unnecessary refactoring but some apps want / need to configure the information passed to the query cache logger. In order to do that we can add a method here that can be easily overridden by the app itself, rather than hacking the query cache logger to include that information. To override apps can call ``` def cache_notifications_info super.merge(connected_host: "hostname") end ``` This will take what's already in the query cache logger and add `@something="yea"` to the object. At GitHub we use this to log the number of queries that are cached, the connection host and the connection url.
* | | Merge pull request #33127 from searls/patch-1Matthew Draper2018-06-121-1/+1
|\ \ \ | |/ / |/| | Remove reference to session_store.rb initializer
| * | Remove reference to session_store.rb initializerJustin Searls2018-06-121-1/+1
|/ / | | | | | | | | | | | | | | Rails no longer generates this file, but Google is still packed with results suggesting it should exist, so that the doc still pointed me to it threw me off (had I deleted it or something?). Probably be better to be vague and prompt the user to stick it in a config file they own. #33124
* | Merge pull request #33123 from siasmj/masterRyuta Kamizono2018-06-121-1/+1
|\ \ | | | | | | Add comma to example in guides/source/active_storage_overview.md [ci skip]
| * | Add comma to example in guides/source/active_storage_overview.md [ci skip]Matt Sias2018-06-111-1/+1
|/ /
* | Merge pull request #33121 from bogdanvlviv/add-changelog-for-32956Ryuta Kamizono2018-06-122-1/+7
|\ \ | | | | | | Add changelog for #32956 [ci skip]
| * | Add changelog for #32956 [ci skip]bogdanvlviv2018-06-122-1/+7
|/ / | | | | | | Add mention about default value of `config.active_model.i18n_full_message`.
* | Merge pull request #33120 from bogdanvlviv/fix-active_model-errors-docsRyuta Kamizono2018-06-122-2/+2
|\ \ | | | | | | Fix active_model/errors docs [ci skip]
| * | Fix active_model/errors docs [ci skip]bogdanvlviv2018-06-122-2/+2
| | | | | | | | | | | | | | | | | | | | | - Fix indentation. - Add a missing dot to the end of the sentence. Related to #32956
* | | Merge pull request #33119 from utilum/project_names_are_not_codeXavier Noria2018-06-112-5/+5
|\ \ \ | | | | | | | | Remove backticks around proejct names
| * | | Remove backticks around proejct namesutilum2018-06-112-5/+5
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #33118 from ↵Rafael França2018-06-112-1/+10
|\ \ \ \ | |/ / / |/| | | | | | | | | | | dan-jensen/fix-eager-load-lockup-bug-in-development Fix bug with eager_load in development environment
| * | | Fix bug with eager_load in development environmentDan Jensen2018-06-112-1/+10
| | | | | | | | | | | | | | | | | | | | Modifies the routes simulator to allow for empty RouteSets, which are created when secondary Engines are loaded.
* | | | Merge pull request #33106 from marcandre/datecalcRafael Mendonça França2018-06-111-15/+12
|\ \ \ \ | | | | | | | | | | | | | | | Improve some DateAndTime calculations
| * | | | Use fetch for better error handlingMarc-Andre Lafortune2018-06-091-2/+2
| | | | |
| * | | | Use same weekday correspondance as Date#wday.Marc-Andre Lafortune2018-06-091-13/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DeepCover revealed that most of these `wday != 0 ? wday - 1 : 6` were not entirely covered, i.e. the case of `wday == 0` was not tested: https://deep-cover.github.io/rails-cover/activesupport/activesupport/lib/active_support/core_ext/date_and_time/calculations.rb.html#L351 There's actually no valid reason to consider Sunday a special case, so this commit simply reajusts the values used for calculations.