Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-04-07 15:10:21 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-04-07 15:10:21 +0300
commit630c555b11c0fc64d3f0c1ec13b314e2efe3f7ee (patch)
tree5873240ec56a19ddb3794154b0efb48efeab73d3 /app/models/namespace.rb
parentf6f4bc2bc0f369b0837f01c45c15421f7f3868a3 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/namespace.rb')
-rw-r--r--app/models/namespace.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index 5f7b8d1c8b1..5dcf240b6c3 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -373,7 +373,7 @@ class Namespace < ApplicationRecord
end
# Deprecated, use #licensed_feature_available? instead. Remove once Namespace#feature_available? isn't used anymore.
- def feature_available?(feature)
+ def feature_available?(feature, _user = nil)
licensed_feature_available?(feature)
end