Commit 06a3af64 authored by Stan Hu's avatar Stan Hu

Merge branch 'ab-namespace-pipeline-entity' into 'master'

Move PipelineEntity to the Ci namespace

See merge request gitlab-org/gitlab!52248
parents 0d2ac3d5 891a16d6
...@@ -99,7 +99,7 @@ create a JSON response according to your needs. ...@@ -99,7 +99,7 @@ create a JSON response according to your needs.
```ruby ```ruby
class PipelineSerializer < BaseSerializer class PipelineSerializer < BaseSerializer
entity PipelineEntity entity Ci::PipelineEntity
def represent_details(resource) def represent_details(resource)
represent(resource, only: [:details]) represent(resource, only: [:details])
......
...@@ -9,7 +9,7 @@ class BuildDetailsEntity < JobEntity ...@@ -9,7 +9,7 @@ class BuildDetailsEntity < JobEntity
expose :user, using: UserEntity expose :user, using: UserEntity
expose :runner, using: RunnerEntity expose :runner, using: RunnerEntity
expose :metadata, using: BuildMetadataEntity expose :metadata, using: BuildMetadataEntity
expose :pipeline, using: PipelineEntity expose :pipeline, using: Ci::PipelineEntity
expose :deployment_status, if: -> (*) { build.starts_environment? } do expose :deployment_status, if: -> (*) { build.starts_environment? } do
expose :deployment_status, as: :status expose :deployment_status, as: :status
......
# frozen_string_literal: true # frozen_string_literal: true
class PipelineEntity < Grape::Entity class Ci::PipelineEntity < Grape::Entity
include RequestAwareEntity include RequestAwareEntity
include Gitlab::Utils::StrongMemoize include Gitlab::Utils::StrongMemoize
......
# frozen_string_literal: true # frozen_string_literal: true
class PipelineDetailsEntity < PipelineEntity class PipelineDetailsEntity < Ci::PipelineEntity
expose :project, using: ProjectEntity expose :project, using: ProjectEntity
expose :flags do expose :flags do
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
require 'spec_helper' require 'spec_helper'
RSpec.describe PipelineEntity do RSpec.describe Ci::PipelineEntity do
include Gitlab::Routing include Gitlab::Routing
let_it_be(:project) { create(:project) } let_it_be(:project) { create(:project) }
......
...@@ -10,8 +10,8 @@ RSpec.describe PipelineDetailsEntity do ...@@ -10,8 +10,8 @@ RSpec.describe PipelineDetailsEntity do
described_class.represent(pipeline, request: request) described_class.represent(pipeline, request: request)
end end
it 'inherrits from PipelineEntity' do it 'inherits from PipelineEntity' do
expect(described_class).to be < PipelineEntity expect(described_class).to be < Ci::PipelineEntity
end end
before do before do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment