Move visibility_level check for forked projects to Project model

2 files changed, 6 insertions, 2 deletions

diff --git a/app/helpers/visibility_level_helper.rb b/app/helpers/visibility_level_helper.rb
index b52cd23aba2..bc594dc53c1 100644
--- a/app/helpers/visibility_level_helper.rb
+++ b/app/helpers/visibility_level_helper.rb
@@ -89,7 +89,6 @@ module VisibilityLevelHelper
 
   def skip_level?(form_model, level)
     form_model.is_a?(Project) &&
-    form_model.forked? &&
-    !Gitlab::VisibilityLevel.allowed_fork_levels(form_model.forked_from_project.visibility_level).include?(level)
+    !form_model.visibility_level_allowed?(level)
   end
 end
diff --git a/app/models/project.rb b/app/models/project.rb
index 74b89aad499..a4c634bdb5c 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -783,4 +783,9 @@ class Project < ActiveRecord::Base
     service.active = true
     service.save
   end
+
+  def visibility_level_allowed?(level)
+    return true unless forked?
+    Gitlab::VisibilityLevel.allowed_fork_levels(forked_from_project.visibility_level).include?(level)
+  end
 end