aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* More exercise test cases for `not_between`Ryuta Kamizono2019-01-122-31/+84
| | | | | | And support endless ranges for `not_between` like as `between`. Follow up #34906.
* Merge pull request #34906 from gregnavis/add-endless-ranges-to-activerecordAaron Patterson2019-01-113-2/+18
|\ | | | | Support endless ranges in where
| * Support endless ranges in whereGreg Navis2019-01-113-2/+18
| | | | | | | | | | | | This commit adds support for endless ranges, e.g. (1..), that were added in Ruby 2.6. They're functionally equivalent to explicitly specifying Float::INFINITY as the end of the range.
* | Merge pull request #34902 from ↵Gannon McGibbon2019-01-111-1/+1
|\ \ | | | | | | | | | | | | lanzhiheng/improve-doc-in-routing-2-10-adding-member-routes improve doc in `Adding Member Routes` section of routing chapter.
| * | [ci skip] improve doc in `Adding Member Routes` section of routing chapter.lanzhiheng2019-01-111-1/+1
| | |
* | | Merge pull request #34913 from ↵Gannon McGibbon2019-01-112-2/+5
|\ \ \ | | | | | | | | | | | | | | | | bogdanvlviv/docs_config_action_mailer_delivery_job Add info about `config.action_mailer.delivery_job` to the guide [ci skip]
| * | | Add info about `config.action_mailer.delivery_job` to the guide [ci skip]bogdanvlviv2019-01-112-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, add mention to `new_framework_defaults_6_0.rb` that `ActionMailer::Parameterized::DeliveryJob` is default for parameterized mail and will be removed. Related to #34692
* | | | Remove `id_value` argument which is no longer passed to `sql_for_insert`Ryuta Kamizono2019-01-112-3/+3
| | | | | | | | | | | | | | | | Since #26002, `id_value` is no longer passed to `sql_for_insert`.
* | | | Fix `test_case_insensitiveness` to follow up eb5fef5Ryuta Kamizono2019-01-111-9/+8
| | | |
* | | | Refactor `bind_attribute` to expand an association to actual attributeRyuta Kamizono2019-01-112-5/+5
| | | |
* | | | Refactor `build_relation` in the uniqueness validator to avoid low level ↵Ryuta Kamizono2019-01-113-27/+29
| | | | | | | | | | | | | | | | predicate construction
* | | | Merge pull request #34922 from ↵Ryuta Kamizono2019-01-119-9/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | okuramasafumi/replace-secrets-with-credentials-in-comments Replace `secrets.yml` with `credentials.yml` in comments [ci skip]
| * | | | Replace `secrets` with `credentials` in commentsokuramasafumi2019-01-119-9/+9
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | In comments in templates for `config/database.yml`, there is a reference to `secrets.yml` which is now deprecated. They should be replaced with `credentials.yml` so that everyone using latest Rails can understand.
* | | | Merge pull request #34919 from ↵Rafael França2019-01-101-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | albertoalmagro/fix-typo-collection-radio-buttons-spec Fix typo in collection_radio_buttons spec
| * | | | Fix typo in collection_radio_buttons spec [ci skip]Alberto Almagro2019-01-111-1/+1
|/ / / /
* | | | Merge pull request #34911 from duleorlovic/guides_i18nRafael França2019-01-101-2/+4
|\ \ \ \ | | | | | | | | | | Add reasoning for `I18n.with_locale`
| * | | | Add reasoning for `I18n.with_locale` and explanation that the problem isDusan Orlovic2019-01-101-2/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | about leak into subsequent requests. [ci skip]
* | | | Merge pull request #34892 from kbrock/safer_safe_constantizeRafael França2019-01-104-0/+20
|\ \ \ \ | | | | | | | | | | Fix safe_constantize to not raise a LoadError.
| * | | | Fix safe_constantize to not raise a LoadError.Keenan Brock2019-01-094-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ### Summary There was an issues when using `safe_constantize` on a string that has the wrong case. File `em.rb` defines `EM`. `"Em".safe_constantize` causes a little confusion with the autoloader. The autoloader finds file "em.rb", expecting it to define `Em`, but `Em` is not defined. The autoloader raises a `LoadError`, which is good, But `safe_constantize` is defined to return `nil` when a class is not found. ### Before ``` "Em".safe_constantize LoadError: Unable to autoload constant Em, \ expected rails/activesupport/test/autoloading_fixtures/em.rb to define it ``` ### After ``` "Em".safe_constantize # => nil ```
* | | | | Merge pull request #34905 from javan/move-npm-packages-to-rails-scopeJavan Makhmali2019-01-1021-53/+48
|\ \ \ \ \ | | | | | | | | | | | | Move all npm packages to @rails scope
| * | | | | Move all npm packages to @rails scopeJavan Makhmali2019-01-1021-53/+48
| | |/ / / | |/| | | | | | | | | | | | | Fixes #33083
* / | | | Add Postmark to the ingress lists [ci skip]George Claghorn2019-01-102-3/+3
|/ / / /
* | | | Tweak Postmark ingress docs [ci skip]George Claghorn2019-01-091-5/+5
| | | |
* | | | Merge pull request #34909 from davidalee/patch-2Prem Sichanugrist2019-01-101-3/+3
|\ \ \ \ | | | | | | | | | | Specify the type for the auto-generated primary key
| * | | | Specify the type for the auto-generated primary keyDavid A. Lee2019-01-091-3/+3
| | | | | | | | | | | | | | | Given the change to using `bigint` as type for auto-generated primary keys (as per https://github.com/rails/rails/pull/26266), I propose updating the Active Record Basics guide to explicitly state the type being used so as to avoid confusion as to the type of integer used, especially as the type can vary depending on the database used.
* | | | | Merge pull request #34908 from robzolkos/fix-actionmailbox-jsonGeorge Claghorn2019-01-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Bring in all of aws-sdk-sns if using Amazon ingress
| * | | | | Bring in all of aws-sdk-sns if using Amazon ingressRob Zolkos2019-01-091-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requiring _just_ the `Aws::SNS::MessageVerifier` does not work as it references other classes in the AWS SDK that are not in this one class. Bringing in the entire SNS SDK verifies the authenticity correctly.
* | | | | Merge pull request #34907 from wildbit/actionmailbox-postmarkGeorge Claghorn2019-01-096-33/+197
|\ \ \ \ \ | |/ / / / |/| | | | Add Postmark ingress support to ActionMailbox
| * | | | Added Postmark ingress supportTomek Maszkowski2019-01-096-33/+197
| | |_|/ | |/| |
* | | | Merge pull request #34900 from gmcgibbon/fix_test_find_only_some_columnsEileen M. Uchitelle2019-01-091-2/+11
|\ \ \ \ | |_|/ / |/| | | Reset column info on original Topic in serialized attr test
| * | | Reset column info on original Topic in serialized attr testGannon McGibbon2019-01-091-2/+11
| | | | | | | | | | | | | | | | | | | | Call .reset_column_information on ::Topic in serialized attribute test so that attribute methods are safely undefined for all topics.
* | | | Merge pull request #34692 from gmcgibbon/use_mail_delivery_job_in_6.0_defaultsRafael França2019-01-098-7/+58
|\ \ \ \ | | | | | | | | | | Move MailDeliveryJob default to 6.0 defaults
| * | | | Fix legacy fallback for parameterized mailersGannon McGibbon2019-01-073-6/+13
| | | | |
| * | | | Move MailDeliveryJob default to 6.0 defaultsGannon McGibbon2019-01-075-1/+45
| | | | |
* | | | | Merge pull request #34899 from rails/speed-up-stepAaron Patterson2019-01-091-1/+4
|\ \ \ \ \ | |_|_|/ / |/| | | | Duration#coerce should always return a Scalar
| * | | | Duration#coerce should always return a ScalarAaron Patterson2019-01-081-1/+4
| | |_|/ | |/| | | | | | | | | | | | | | | | | | This speeds up Range.new(x, y).step(Duration).each { ... } Fixes #34888
* | | | Enable `Lint/UselessAssignment` cop to avoid unused variable warnings (#34904)Ryuta Kamizono2019-01-0915-25/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Enable `Lint/UselessAssignment` cop to avoid unused variable warnings Since we've addressed the warning "assigned but unused variable" frequently. 370537de05092aeea552146b42042833212a1acc 3040446cece8e7a6d9e29219e636e13f180a1e03 5ed618e192e9788094bd92c51255dda1c4fd0eae 76ebafe594fc23abc3764acc7a3758ca473799e5 And also, I've found the unused args in c1b14ad which raises no warnings by the cop, it shows the value of the cop.
* | | | Merge pull request #34860 from toshimaru/make-guides-sns-friendlyRyuta Kamizono2019-01-093-4/+18
|\ \ \ \ | | | | | | | | | | Make Ruby on Rails Guides SNS-friendly
| * | | | Add OG tags to layout.html.erbtoshimaru2019-01-093-4/+18
|/ / / /
* | | | Merge pull request #34903 from y-yagi/enable_deprecated_class_methods_copYuji Yaginuma2019-01-092-1/+4
|\ \ \ \ | | | | | | | | | | Enable `Lint/DeprecatedClassMethods` cop to avoid using deprecated methods
| * | | | Enable `Lint/DeprecatedClassMethods` cop to avoid using deprecated methodsyuuji.yaginuma2019-01-092-1/+4
|/ / / /
* | | | Merge pull request #34894 from hahmed/tames-params-wrapper-errorsKasper Timm Hansen2019-01-091-16/+17
|\ \ \ \ | | | | | | | | | | Capture parsing errors only for ActionController::ParamsWrapper#process_actions
| * | | | Capture parsing errors for ActionController::ParamsWrapper#process_actionHaroon Ahmed2019-01-081-16/+17
| | | | |
* | | | | Merge pull request #34885 from y-yagi/fixes_34780Yuji Yaginuma2019-01-092-4/+16
|\ \ \ \ \ | | | | | | | | | | | | Allow using combine the Cache-Control `public` and `no-cache` headers
| * | | | | Allow using combine the Cache-Control `public` and `no-cache` headersyuuji.yaginuma2019-01-072-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since #30367, if `no-cache` includes Cache-Control headers, special keys like `public`, `must-revalidate` are ignored. But in my understanding, `public` still need in case of want to cache authenticated pages. The authenticated pages to be cacheable, but still authenticated for every user, need to specify the `Cache-Control: public, no-cache`. For keys other than `public`, I did not know the case where it was necessary to use it in combination with `no-cache`, so I fixed that can be used only for `public`. Ref: https://www.mnot.net/cache_docs/#CACHE-CONTROL Fixes #34780.
* | | | | | Preserve Bundle configuration during app generation (#34755)Marco Costa2019-01-093-9/+33
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When generating a new rails application (rails new) using a custom template that includes gems from an authenticated source, the user has to provide credentials to bundler. One way to do this is by exporting environment variables, for example: export BUNDLE_GITHUB__COM=user:pass: provides credentials for bundler to fetch gems from github.com. The problem this PR addresses is that we are currently scrubs all /BUNDLE_.*/ environment variables by wrapping our system calls in Bundler.with_clean_env. We do this because we don't want our commands executed against the generated project to use the generator's bundler environment (e.g. our gems): the generated project should use it's own configuration. The problem with Bundler.with_clean_env is that, on top of restoring environment variables to their original state, it also scrubs any /BUNDLE_.*/ variables, which is harmful for authenticated gem sources. This PR replaces Bundler.with_clean_env with Bundler.with_original_env, which only restores environment variables to their initial state, without additional scrubbing.
* | | | | Revert "Merge pull request #34387 from yhirano55/rails_info_properties_json"Kasper Timm Hansen2019-01-085-37/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had a discussion on the Core team and we don't want to expose this information as a JSON endpoint and not by default. It doesn't make sense to expose this JSON locally and this controller is only accessible in dev, so the proposed access from a production app seems off. This reverts commit 8eaffe7e89719ac62ff29c2e4208cfbeb1cd1c38, reversing changes made to 133e0ba33db5887b047c9ac8233e5b414657bca5.
* | | | | Revert "Revert "Merge pull request #34387 from ↵Kasper Timm Hansen2019-01-0813-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | yhirano55/rails_info_properties_json"" I reverted the wrong commit. Damn it. This reverts commit f66a977fc7ae30d2a07124ad91924c4ee638a703.
* | | | | Revert "Merge pull request #34387 from yhirano55/rails_info_properties_json"Kasper Timm Hansen2019-01-0813-50/+0
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had a discussion on the Core team and we don't want to expose this information as a JSON endpoint and not by default. It doesn't make sense to expose this JSON locally and this controller is only accessible in dev, so the proposed access from a production app seems off. This reverts commit 8eaffe7e89719ac62ff29c2e4208cfbeb1cd1c38, reversing changes made to b6e4305c3bca4c673996d0af9db0f4cfbf50215e.
* | | | The frameworks list is order dependent.Kasper Timm Hansen2019-01-081-6/+7
| | | | | | | | | | | | | | | | Ref: https://github.com/rails/rails/commit/d507f332a955eed3d3af805a0d417fb56379a6b9