diff --git a/actionview/lib/action_view/helpers/form_helper.rb b/actionview/lib/action_view/helpers/form_helper.rb index 996bdecaf6..7cfd2df5e6 100644 --- a/actionview/lib/action_view/helpers/form_helper.rb +++ b/actionview/lib/action_view/helpers/form_helper.rb @@ -1121,6 +1121,8 @@ def fields(scope = nil, model: nil, **options, &block) # post: # cost: "Total cost" # + # + # # label(:post, :cost) # # => # @@ -2365,6 +2367,8 @@ def fields(scope = nil, model: nil, **options, &block) # post: # cost: "Total cost" # + # + # # label(:cost) # # => # diff --git a/actionview/lib/action_view/helpers/sanitize_helper.rb b/actionview/lib/action_view/helpers/sanitize_helper.rb index a16b4a32c8..089e613204 100644 --- a/actionview/lib/action_view/helpers/sanitize_helper.rb +++ b/actionview/lib/action_view/helpers/sanitize_helper.rb @@ -60,6 +60,8 @@ module SanitizeHelper # end # end # + # + # # <%= sanitize @comment.body, scrubber: CommentScrubber.new %> # # See {Rails HTML Sanitizer}[https://github.com/rails/rails-html-sanitizer] for @@ -71,6 +73,8 @@ module SanitizeHelper # node.remove if node.name == 'script' # end # + # + # # <%= sanitize @comment.body, scrubber: scrubber %> # # See {Loofah's documentation}[https://github.com/flavorjones/loofah] for more diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index 9cb7400126..c6264cb50d 100644 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -268,6 +268,8 @@ class FixtureClassNotFound < ActiveRecord::ActiveRecordError # :nodoc: # name: Reginald the Pirate # monkey_id: 1 # + # + # # ### in monkeys.yml # # george: @@ -285,6 +287,8 @@ class FixtureClassNotFound < ActiveRecord::ActiveRecordError # :nodoc: # name: Reginald the Pirate # monkey: george # + # + # # ### in monkeys.yml # # george: @@ -306,6 +310,8 @@ class FixtureClassNotFound < ActiveRecord::ActiveRecordError # :nodoc: # # belongs_to :eater, polymorphic: true # + # + # # ### in fruits.yml # # apple: @@ -331,6 +337,8 @@ class FixtureClassNotFound < ActiveRecord::ActiveRecordError # :nodoc: # id: 1 # name: George the Monkey # + # + # # ### in fruits.yml # # apple: @@ -345,6 +353,8 @@ class FixtureClassNotFound < ActiveRecord::ActiveRecordError # :nodoc: # id: 3 # name: grape # + # + # # ### in fruits_monkeys.yml # # apple_george: @@ -368,6 +378,8 @@ class FixtureClassNotFound < ActiveRecord::ActiveRecordError # :nodoc: # name: George the Monkey # fruits: apple, orange, grape # + # + # # ### in fruits.yml # # apple: @@ -467,6 +479,8 @@ class FixtureClassNotFound < ActiveRecord::ActiveRecordError # :nodoc: # belongs_to :author # end # + # + # # # books.yml # alices_adventure_in_wonderland: # author_id: <%= ActiveRecord::FixtureSet.identify(:lewis_carroll) %> @@ -482,6 +496,8 @@ class FixtureClassNotFound < ActiveRecord::ActiveRecordError # :nodoc: # belongs_to :book, query_constraints: [:author_id, :book_id] # end # + # + # # # book_orders.yml # alices_adventure_in_wonderland_in_books: # author: lewis_carroll diff --git a/activestorage/lib/active_storage/fixture_set.rb b/activestorage/lib/active_storage/fixture_set.rb index 2611a3821c..b046b6859a 100644 --- a/activestorage/lib/active_storage/fixture_set.rb +++ b/activestorage/lib/active_storage/fixture_set.rb @@ -26,9 +26,13 @@ module ActiveStorage # has_one_attached :thumbnail # end # + # + # # # fixtures/active_storage/blobs.yml # first_thumbnail_blob: <%= ActiveStorage::FixtureSet.blob filename: "first.png" %> # + # + # # # fixtures/active_storage/attachments.yml # first_thumbnail_attachment: # name: thumbnail diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 2cf734b0e5..94e91eb478 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -234,8 +234,7 @@ def deprecators end # Convenience for loading config/foo.yml for the current \Rails env. - # - # Examples: + # Example: # # # config/exception_notification.yml: # production: @@ -246,13 +245,15 @@ def deprecators # url: http://localhost:3001 # namespace: my_app_development # + # + # # # config/environments/production.rb # Rails.application.configure do # config.middleware.use ExceptionNotifier, config_for(:exception_notification) # end # - # # You can also store configurations in a shared section which will be - # # merged with the environment configuration + # You can also store configurations in a shared section which will be merged + # with the environment configuration # # # config/example.yml # shared: @@ -265,6 +266,8 @@ def deprecators # bar: # qux: 2 # + # + # # # development environment # Rails.application.config_for(:example)[:foo][:bar] # # => { baz: 1, qux: 2 }