summaryrefslogtreecommitdiff
path: root/lib/gitlab/visibility_level.rb
diff options
context:
space:
mode:
authorVinnie Okada <vincent@gitlab.com>2015-03-18 12:38:58 -0600
committerVinnie Okada <vincent@gitlab.com>2015-03-18 12:50:27 -0600
commite535d217687d3f00844857400282462dfa13049c (patch)
treea3aa6a1fe72e4bb8ba3f11a906cf280c52b46639 /lib/gitlab/visibility_level.rb
parent0eaabc270868b79185f72ac6e99551e33dbb3c23 (diff)
downloadgitlab-ce-e535d217687d3f00844857400282462dfa13049c.tar.gz
Handle nil restricted visibility settings
Return `true` from `non_restricted_level?` when the `restricted_visibility_levels` setting is nil.
Diffstat (limited to 'lib/gitlab/visibility_level.rb')
-rw-r--r--lib/gitlab/visibility_level.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/visibility_level.rb b/lib/gitlab/visibility_level.rb
index 1851e76067c..e4306bd2a56 100644
--- a/lib/gitlab/visibility_level.rb
+++ b/lib/gitlab/visibility_level.rb
@@ -35,7 +35,11 @@ module Gitlab
end
def non_restricted_level?(level)
- ! current_application_settings.restricted_visibility_levels.include?(level)
+ if current_application_settings.restricted_visibility_levels.nil?
+ true
+ else
+ ! current_application_settings.restricted_visibility_levels.include?(level)
+ end
end
def valid_level?(level)