Merge branch 'bvl-upload-designs-fix-ce' into 'master'

Make Gitlab::GlRepository#types an instance method

See merge request gitlab-org/gitlab-ce!27902

2 files changed, 11 insertions, 3 deletions

diff --git a/lib/gitlab/gl_repository.rb b/lib/gitlab/gl_repository.rb
index a56ca1e39e7..04dabe423e8 100644
--- a/lib/gitlab/gl_repository.rb
+++ b/lib/gitlab/gl_repository.rb
@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 module Gitlab
-  module GlRepository
+  class GlRepository
+    include Singleton
+
     PROJECT = RepoType.new(
       name: :project,
       access_checker_class: Gitlab::GitAccess,
@@ -19,7 +21,7 @@ module Gitlab
     }.freeze
 
     def self.types
-      TYPES
+      instance.types
     end
 
     def self.parse(gl_repository)
@@ -39,5 +41,11 @@ module Gitlab
     def self.default_type
       PROJECT
     end
+
+    def types
+      TYPES
+    end
+
+    private_class_method :instance
   end
 end
diff --git a/lib/gitlab/gl_repository/repo_type.rb b/lib/gitlab/gl_repository/repo_type.rb
index 7abe6c29a25..19915980d7f 100644
--- a/lib/gitlab/gl_repository/repo_type.rb
+++ b/lib/gitlab/gl_repository/repo_type.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Gitlab
-  module GlRepository
+  class GlRepository
     class RepoType
       attr_reader :name,
                   :access_checker_class,