Add latest changes from gitlab-org/gitlab@master

2 files changed, 1 insertions, 5 deletions

diff --git a/lib/bulk_imports/common/transformers/user_reference_transformer.rb b/lib/bulk_imports/common/transformers/user_reference_transformer.rb
index ca077b4ef43..c330ea59113 100644
--- a/lib/bulk_imports/common/transformers/user_reference_transformer.rb
+++ b/lib/bulk_imports/common/transformers/user_reference_transformer.rb
@@ -12,7 +12,7 @@ module BulkImports
         DEFAULT_REFERENCE = 'user'
 
         def initialize(options = {})
-          @reference = options[:reference] || DEFAULT_REFERENCE
+          @reference = options[:reference].to_s.presence || DEFAULT_REFERENCE
           @suffixed_reference = "#{@reference}_id"
         end
 
diff --git a/lib/gitlab/ci/features.rb b/lib/gitlab/ci/features.rb
index 9fa4fa1d7b7..320f3a959fa 100644
--- a/lib/gitlab/ci/features.rb
+++ b/lib/gitlab/ci/features.rb
@@ -63,10 +63,6 @@ module Gitlab
       def self.multiple_cache_per_job?
         ::Feature.enabled?(:multiple_cache_per_job, default_enabled: :yaml)
       end
-
-      def self.remove_duplicate_artifact_exposure_paths?(project)
-        ::Feature.enabled?(:remove_duplicate_artifact_exposure_paths, project, default_enabled: :yaml)
-      end
     end
   end
 end