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:
authorVinnie Okada <vincent@gitlab.com>2015-03-18 21:38:58 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-19 00:04:17 +0300
commit33d5a60571267ffa33fcb3e19f03f977e1a3f9c8 (patch)
tree8fd673eaeaa8c8f25e39034bae6fc5b4871798fc
parentc0524574c8d2c94fd50499b754f8aaa70e2dde4c (diff)
Handle nil restricted visibility settings
Return `true` from `non_restricted_level?` when the `restricted_visibility_levels` setting is nil.
-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)