Skip to content

Commit

Permalink
Merge pull request ryanb#426 from manuelmeurer/patch-1
Browse files Browse the repository at this point in the history
Fixed documentation for skip_load_resource and skip_authorize_resource.
  • Loading branch information
ryanb committed Jul 23, 2011
2 parents 600a3e1 + e561532 commit e0492f5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/cancan/controller_additions.rb
Expand Up @@ -186,7 +186,7 @@ def skip_load_and_authorize_resource(*args)
skip_authorize_resource(*args)
end

# Skip both the loading behavior of CanCan. This is useful when using +load_and_authorize_resource+ but want to
# Skip the loading behavior of CanCan. This is useful when using +load_and_authorize_resource+ but want to
# only do authorization on certain actions. You can pass :only and :except options to specify which actions to
# skip the effects on. It will apply to all actions by default.
#
Expand All @@ -202,7 +202,7 @@ def skip_load_resource(*args)
cancan_skipper[:load][name] = options
end

# Skip both the authorization behavior of CanCan. This is useful when using +load_and_authorize_resource+ but want to
# Skip the authorization behavior of CanCan. This is useful when using +load_and_authorize_resource+ but want to
# only do loading on certain actions. You can pass :only and :except options to specify which actions to
# skip the effects on. It will apply to all actions by default.
#
Expand Down

0 comments on commit e0492f5

Please sign in to comment.