Merge branch '207480-move-all-ci-files-under-ci-namespace' into 'master'

Move variable serializers under `Ci::` namespace"

See merge request gitlab-org/gitlab!36636

app/controllers/groups/variables_controller.rb

@@ -9,7 +9,7 @@ module Groups
     def show
       respond_to do |format|
         format.json do
-          render status: :ok, json: { variables: GroupVariableSerializer.new.represent(@group.variables) }
+          render status: :ok, json: { variables: ::Ci::GroupVariableSerializer.new.represent(@group.variables) }
         end
       end
     end
@@ -29,7 +29,7 @@ module Groups
     private
 
     def render_group_variables
-      render status: :ok, json: { variables: GroupVariableSerializer.new.represent(@group.variables) }
+      render status: :ok, json: { variables: ::Ci::GroupVariableSerializer.new.represent(@group.variables) }
     end
 
     def render_error

app/controllers/projects/variables_controller.rb

@@ -6,7 +6,7 @@ class Projects::VariablesController < Projects::ApplicationController
   def show
     respond_to do |format|
       format.json do
-        render status: :ok, json: { variables: VariableSerializer.new.represent(@project.variables) }
+        render status: :ok, json: { variables: ::Ci::VariableSerializer.new.represent(@project.variables) }
       end
     end
   end
@@ -26,7 +26,7 @@ class Projects::VariablesController < Projects::ApplicationController
   private
 
   def render_variables
-    render status: :ok, json: { variables: VariableSerializer.new.represent(@project.variables) }
+    render status: :ok, json: { variables: ::Ci::VariableSerializer.new.represent(@project.variables) }
   end
 
   def render_error

app/serializers/group_variable_entity.rb → app/serializers/ci/group_variable_entity.rb

 # frozen_string_literal: true
 
-class GroupVariableEntity < Ci::BasicVariableEntity
+module Ci
+  class GroupVariableEntity < Ci::BasicVariableEntity
+  end
 end

app/serializers/ci/group_variable_serializer.rb

+# frozen_string_literal: true
+
+module Ci
+  class GroupVariableSerializer < BaseSerializer
+    entity ::Ci::GroupVariableEntity
+  end
+end

app/serializers/ci/variable_entity.rb

+# frozen_string_literal: true
+
+module Ci
+  class VariableEntity < Ci::BasicVariableEntity
+    expose :environment_scope
+  end
+end

app/serializers/ci/variable_serializer.rb

+# frozen_string_literal: true
+
+module Ci
+  class VariableSerializer < BaseSerializer
+    entity ::Ci::VariableEntity
+  end
+end

app/serializers/group_variable_serializer.rb

-# frozen_string_literal: true
-
-class GroupVariableSerializer < BaseSerializer
-  entity GroupVariableEntity
-end

app/serializers/variable_entity.rb

-# frozen_string_literal: true
-
-class VariableEntity < Ci::BasicVariableEntity
-  expose :environment_scope
-end

app/serializers/variable_serializer.rb

-# frozen_string_literal: true
-
-class VariableSerializer < BaseSerializer
-  entity VariableEntity
-end

spec/serializers/group_variable_entity_spec.rb → spec/serializers/ci/group_variable_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe GroupVariableEntity do
+RSpec.describe Ci::GroupVariableEntity do
   let(:variable) { create(:ci_group_variable) }
   let(:entity) { described_class.new(variable) }
 

spec/serializers/variable_entity_spec.rb → spec/serializers/ci/variable_entity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe VariableEntity do
+RSpec.describe Ci::VariableEntity do
   let(:variable) { create(:ci_variable) }
   let(:entity) { described_class.new(variable) }