Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 2 deletions

diff --git a/rubocop/cop/gitlab/json.rb b/rubocop/cop/gitlab/json.rb
index 32bfdd9bfdc..d27c8dab66c 100644
--- a/rubocop/cop/gitlab/json.rb
+++ b/rubocop/cop/gitlab/json.rb
@@ -25,7 +25,7 @@ module RuboCop
           return unless method_name
 
           add_offense(node) do |corrector|
-            replacement = "Gitlab::Json.#{method_name}(#{arg_source})"
+            replacement = "#{cbased(node)}Gitlab::Json.#{method_name}(#{arg_source})"
 
             corrector.replace(node.source_range, replacement)
           end
@@ -38,7 +38,7 @@ module RuboCop
 
           # Only match if the method is implemented by Gitlab::Json
           if method_name && AVAILABLE_METHODS.include?(method_name)
-            return [method_name, arg_nodes.map(&:source).join(', ')]
+            return [method_name, arg_nodes.map(&:source).join(", ")]
           end
 
           receiver = to_json_call?(node)
@@ -46,6 +46,12 @@ module RuboCop
 
           nil
         end
+
+        def cbased(node)
+          return unless %r{/ee/}.match?(node.location.expression.source_buffer.name)
+
+          "::"
+        end
       end
     end
   end