aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Add mention to the main README about new libraries [ci skip]bogdanvlviv2019-01-132-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Action Mailbox and Action Text belong to rails/rails since #34786 and #34873.
* | | | | | Merge pull request #34937 from rmacklin/document-actioncable-js-changesRafael França2019-01-142-0/+52
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Document the ActionCable JS changes in the upgrade guide and release notes
| * | | | | Document the ActionCable JS changes in the upgrade guide & release notesRichard Macklin2019-01-142-0/+52
|/ / / / /
* | | | | Merge pull request #34891 from gmcgibbon/ac_params_existsRafael França2019-01-144-0/+31
|\ \ \ \ \ | | | | | | | | | | | | Allow strong params in ActiveRecord::Base#exists?
| * \ \ \ \ Merge branch 'master' into ac_params_existsAaron Patterson2019-01-11113-395/+704
| |\ \ \ \ \
| * | | | | | Allow strong params in ActiveRecord::Base#exists?Gannon McGibbon2019-01-074-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow `ActionController::Params` as argument of `ActiveRecord::Base#exists?`
* | | | | | | Refactor calculating beginning_of_quarter and end_of_quarter (#34927)Krzysztof Rybka2019-01-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Calculate first month of quarter instead of finding * Calculate last month of quarter instead of finding [Krzysztof Rybka + Rafael Mendonça França]
* | | | | | | Merge pull request #34934 from ↵Rafael França2019-01-143-16/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rmacklin/simplify-actioncable-methods-after-decaffeination Clean up ActionCable JS a bit more after the CoffeeScript conversion
| * | | | | | | Simplify `this.isActive() && this.webSocket` into `this.isActive()`Richard Macklin2019-01-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in Connection#close. We can do this because `isActive()` can only return `true` if `this.webSocket` is truthy. (We can't have an active connection without having instantiated a WebSocket. This is confirmed in the code: Connection#isActive calls Connection#isState which calls Connection#getState, which checks if `this.webSocket` is truthy and returns `null` otherwise.)
| * | | | | | | Simplify ActionCable.getConfig, Connection#getProtocol, and Connection#closeRichard Macklin2019-01-143-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by relying on the implicit undefined return value
| * | | | | | | Simplify ActionCable.createConsumer by using default argumentRichard Macklin2019-01-142-10/+3
| | | | | | | |
* | | | | | | | Merge pull request #33962 from kaspth/restructure-environment-credentialsKasper Timm Hansen2019-01-147-114/+122
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Restructure credentials after environment overrides.
| * | | | | | | | Restructure credentials after environment overrides.Kasper Timm Hansen2019-01-147-114/+122
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to: e0d3313 - Revert renames from `encrypted` and `encrypted_file` back to `credentials`. They might be using our Encrypted* generators but from that level of abstraction they're still about credentials. - Same vein: extract a `credentials` method for the `encrypted` local variable. But don't call it `encrypted` just because it uses that under the hood. It's about capturing the credentials. It's also useful in `change_credentials_in_system_editor`. - Remove lots of needless argument passing. We've abstracted content_path and key_path into methods for a reason, so they should be used. Also spares a conspicuous rename of content_path into file_path in other methods. - Reorders private methods so they're grouped into: command building blocks, option parsers, and the generators. - Extracts commonality in the credentials application tests. A tad unsure about this. But I do like that we go with key, content thus matching the command and remove the yield which isn't really needed. - Moves test/credentials_test.rb to beneath the test/application directory. It's a Rails application test, so it should be in there. - Uses `root.join` — a neat trick gleaned from the tests! — and composes the configuration private methods such that the building block is below the callers.
* | | | | | | | Merge pull request #34933 from palkan/feature/cable-testing-guidesKasper Timm Hansen2019-01-1413-5/+195
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Add Action Cable testing guides and generators
| * | | | | | | Add Action Cable Testing guidesVladimir Dementyev2019-01-145-4/+129
| | | | | | | |
| * | | | | | | Add connection_test to app generatorVladimir Dementyev2019-01-133-0/+18
| | | | | | | |
| * | | | | | | Add channel test generatorVladimir Dementyev2019-01-135-1/+48
|/ / / / / / /
* | | | | | | Update Action Cable connection testing.Kasper Timm Hansen2019-01-142-57/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Don't reimplement assert_raises Also test what happens in case there's no explicit rejection. * Avoid OpenStruct. Remove space beneath private. * Simplify verification methods for code under test. * Match documentation with other Rails docs. Also remove mention of the custom path argument for now. Unsure how useful that really is.
* | | | | | | Merge pull request #34932 from ↵Ryuta Kamizono2019-01-141-8/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bogdanvlviv/fix-action-cable-guide-follow-up-34709 Fix "Action Cable Overview" guide [ci skip]
| * | | | | | | Fix "Action Cable Overview" guide [ci skip]bogdanvlviv2019-01-131-8/+8
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix path to channel files. `rails generate channel Chat` generates `app/javascript/channels/chat_channel.js`. See also, railties/lib/rails/generators/rails/app/templates/app/javascript/packs/application.js.tt, actioncable/lib/rails/generators/channel/templates/javascript/index.js.tt by default `application.js` imports "channels", where `app/javascript/channels/index.js` loads all the channels within this directory and all subdirectories. Follow up #34709 Related to #33079
* | | | | | | Merge pull request #34930 from ↵Ryuta Kamizono2019-01-142-544/+31
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | bogdanvlviv/merge-actioncable-README.md-to-the-guide Merge `actioncable/README.md` to the Action Cable Overview guide [ci skip]
| * | | | | | Merge `actioncable/README.md` to the Action Cable Overview guide [ci skip]bogdanvlviv2019-01-132-544/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In #34709 we updated the guide, but `actioncable/README.md` is still outdated. Instead of fixing content in the file. I suggest not duplicate the info that is already in the guide and instead remove the info from the file and just add a message: "You can read more about Action Cable in the [Action Cable Overview](https://edgeguides.rubyonrails.org/action_cable_overview.html) guide." The same approach is being used for Action Mailbox and Action Text, see #34812 and #34878.
* | | | | | | Merge pull request #34845 from palkan/feature/action-cable-connection-testingKasper Timm Hansen2019-01-133-0/+434
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Add ActionCable::Connection::TestCase
| * | | | | | feature: add ActionCable::Connection::TestCaseVladimir Dementyev2019-01-023-0/+434
| | | | | | |
* | | | | | | Add Exim and Qmail support to Action MailboxGeorge Claghorn2019-01-1210-68/+196
| | | | | | |
* | | | | | | 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.