summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-07-10 12:05:54 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-07-10 12:05:54 +0000
commitbda04bc687e5fafc05d07fa234c96e49d9c4f3fc (patch)
tree9aefc4c84361cb769fc499d4e33c501d0f44a462 /lib
parent7574ec4b85e03f1c1f5d957eee2ef7b29f718c80 (diff)
parent111ebe54712aca16f3ad0f3d859c1c036ccb9f09 (diff)
downloadgitlab-ce-bda04bc687e5fafc05d07fa234c96e49d9c4f3fc.tar.gz
Merge branch 'fork_visibility_level' into 'master'
Forks should not have more permissive visibility levels than the original https://dev.gitlab.org/gitlab/gitlabhq/issues/2286 See merge request !936
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/visibility_level.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/gitlab/visibility_level.rb b/lib/gitlab/visibility_level.rb
index 582fc759efd..335dc44be19 100644
--- a/lib/gitlab/visibility_level.rb
+++ b/lib/gitlab/visibility_level.rb
@@ -47,6 +47,10 @@ module Gitlab
def valid_level?(level)
options.has_value?(level)
end
+
+ def allowed_fork_levels(origin_level)
+ [PRIVATE, INTERNAL, PUBLIC].select{ |level| level <= origin_level }
+ end
end
def private?