summaryrefslogtreecommitdiffstats
path: root/app/models/user.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 2993cc152..5f9674d2d 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -567,7 +567,11 @@ class User < Principal
# Is the user allowed to do the specified action on any project?
# See allowed_to? for the actions and valid options.
- def allowed_to_globally?(action, options, &block)
+ #
+ # NB: this method is not used anywhere in the core codebase as of
+ # 2.5.2, but it's used by many plugins so if we ever want to remove
+ # it it has to be carefully deprecated for a version or two.
+ def allowed_to_globally?(action, options={}, &block)
allowed_to?(action, nil, options.reverse_merge(:global => true), &block)
end