diff options
| author | Yuji Yaginuma <yuuji.yaginuma@gmail.com> | 2019-07-15 07:32:06 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-15 07:32:06 +0900 |
| commit | b4c715fe63d81b0dd0f7c10ac95bf17b0f897c7c (patch) | |
| tree | 99e2b9d58ce445786c131c70ce2f555c402f43e7 | |
| parent | 340667243c12b7ba879e0e2db71b3f8843f75379 (diff) | |
| parent | 6c5acd5bc1efbeca4384353fcde946fc83ae094d (diff) | |
| download | rails-b4c715fe63d81b0dd0f7c10ac95bf17b0f897c7c.tar.gz rails-b4c715fe63d81b0dd0f7c10ac95bf17b0f897c7c.tar.bz2 rails-b4c715fe63d81b0dd0f7c10ac95bf17b0f897c7c.zip | |
Merge pull request #36679 from jacobbednarz/update-feature-policy-example-config
Use reserved domain for example configuration
3 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 72d6c46782..8e36df1bcc 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -15,7 +15,7 @@ f.microphone :none f.usb :none f.fullscreen :self - f.payment :self, "https://secure-example.com" + f.payment :self, "https://secure.example.com" end ``` diff --git a/actionpack/lib/action_controller/metal/feature_policy.rb b/actionpack/lib/action_controller/metal/feature_policy.rb index eecca20dda..a627eabea6 100644 --- a/actionpack/lib/action_controller/metal/feature_policy.rb +++ b/actionpack/lib/action_controller/metal/feature_policy.rb @@ -19,7 +19,7 @@ module ActionController #:nodoc: # f.microphone :none # f.usb :none # f.fullscreen :self - # f.payment :self, "https://secure-example.com" + # f.payment :self, "https://secure.example.com" # end # # # Controller level policy diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/feature_policy.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/feature_policy.rb.tt index 355c7bd62a..a1c46695d2 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/initializers/feature_policy.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/feature_policy.rb.tt @@ -7,5 +7,5 @@ # f.microphone :none # f.usb :none # f.fullscreen :self -# f.payment :self, "https://secure-example.com" +# f.payment :self, "https://secure.example.com" # end |