ditkrg/active_model_serializers
4
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-25 07:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1792 from bf4/spelling_fixes

Browse Source 
Fix spelling
This commit is contained in:
Benjamin Fleischer 2016-06-09 19:44:57 -05:00 committed by GitHub
commit a52189c9c0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/general/serializers.md
View File

@ -266,7 +266,7 @@ In the controller, the scope/scope_name options are equal to
the [`serialization_scope`method](https://github.com/rails-api/active_model_serializers/blob/d02cd30fe55a3ea85e1d351b6e039620903c1871/lib/action_controller/serialization.rb#L13-L20), the [`serialization_scope`method](https://github.com/rails-api/active_model_serializers/blob/d02cd30fe55a3ea85e1d351b6e039620903c1871/lib/action_controller/serialization.rb#L13-L20),
which is `:current_user`, by default. which is `:current_user`, by default.
Specfically, the `scope_name` is defaulted to `:current_user`, and may be set as Specifically, the `scope_name` is defaulted to `:current_user`, and may be set as
`serialization_scope :view_context`. The `scope` is set to `send(scope_name)` when `scope_name` is `serialization_scope :view_context`. The `scope` is set to `send(scope_name)` when `scope_name` is
present and the controller responds to `scope_name`. present and the controller responds to `scope_name`.

2
test/benchmark/app.rb
View File

@ -43,7 +43,7 @@ class BenchmarkApp < Rails::Application
config.secret_key_base = 'abc123' config.secret_key_base = 'abc123'
config.consider_all_requests_local = false config.consider_all_requests_local = false
# otherwise deadlock occured # otherwise deadlock occurred
config.middleware.delete 'Rack::Lock' config.middleware.delete 'Rack::Lock'
# to disable log files # to disable log files