Code fixes

1 files changed, 6 insertions, 7 deletions

diff --git a/lib/gitlab/visibility_level.rb b/lib/gitlab/visibility_level.rb
index f6e0dd6afc0..f193fb282ab 100644
--- a/lib/gitlab/visibility_level.rb
+++ b/lib/gitlab/visibility_level.rb
@@ -6,19 +6,18 @@
 module Gitlab
   module VisibilityLevel
     extend CurrentSettings
+    extend ActiveSupport::Concern
+
+    included do
+      scope :public_only, -> { where(visibility_level: PUBLIC) }
+      scope :public_and_internal_only, -> { where(visibility_level: [PUBLIC, INTERNAL] ) }
+    end
 
     PRIVATE  = 0 unless const_defined?(:PRIVATE)
     INTERNAL = 10 unless const_defined?(:INTERNAL)
     PUBLIC   = 20 unless const_defined?(:PUBLIC)
 
     class << self
-      def included(base)
-        base.class_eval do
-          scope :public_only, -> { where(visibility_level: PUBLIC) }
-          scope :public_and_internal_only, -> { where(visibility_level: [PUBLIC, INTERNAL] ) }
-        end
-      end
-
       def values
         options.values
       end