diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-19 07:33:21 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-19 07:33:21 +0000 |
commit | 36a59d088eca61b834191dacea009677a96c052f (patch) | |
tree | e4f33972dab5d8ef79e3944a9f403035fceea43f /lib/api/entities | |
parent | a1761f15ec2cae7c7f7bbda39a75494add0dfd6f (diff) | |
download | gitlab-ce-36a59d088eca61b834191dacea009677a96c052f.tar.gz |
Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42
Diffstat (limited to 'lib/api/entities')
-rw-r--r-- | lib/api/entities/ci/job_request/dependency.rb | 7 | ||||
-rw-r--r-- | lib/api/entities/ci/job_request/response.rb | 4 | ||||
-rw-r--r-- | lib/api/entities/ci/lint/result.rb | 1 | ||||
-rw-r--r-- | lib/api/entities/ci/secure_file.rb | 1 | ||||
-rw-r--r-- | lib/api/entities/clusters/agent_token.rb | 11 | ||||
-rw-r--r-- | lib/api/entities/clusters/agent_token_basic.rb | 17 | ||||
-rw-r--r-- | lib/api/entities/clusters/agent_token_with_token.rb | 11 | ||||
-rw-r--r-- | lib/api/entities/environment.rb | 1 | ||||
-rw-r--r-- | lib/api/entities/plan_limit.rb | 9 | ||||
-rw-r--r-- | lib/api/entities/project.rb | 6 | ||||
-rw-r--r-- | lib/api/entities/projects/topic.rb | 1 | ||||
-rw-r--r-- | lib/api/entities/user.rb | 3 |
12 files changed, 69 insertions, 3 deletions
diff --git a/lib/api/entities/ci/job_request/dependency.rb b/lib/api/entities/ci/job_request/dependency.rb index 2672a4a245b..63c1552de8a 100644 --- a/lib/api/entities/ci/job_request/dependency.rb +++ b/lib/api/entities/ci/job_request/dependency.rb @@ -5,7 +5,12 @@ module API module Ci module JobRequest class Dependency < Grape::Entity - expose :id, :name, :token + expose :id, :name + + expose :token do |job, options| + options[:running_job]&.token + end + expose :artifacts_file, using: Entities::Ci::JobArtifactFile, if: ->(job, _) { job.available_artifacts? } end end diff --git a/lib/api/entities/ci/job_request/response.rb b/lib/api/entities/ci/job_request/response.rb index 86c945cb236..9de415ebacb 100644 --- a/lib/api/entities/ci/job_request/response.rb +++ b/lib/api/entities/ci/job_request/response.rb @@ -28,8 +28,10 @@ module API expose :artifacts, using: Entities::Ci::JobRequest::Artifacts expose :cache, using: Entities::Ci::JobRequest::Cache expose :credentials, using: Entities::Ci::JobRequest::Credentials - expose :all_dependencies, as: :dependencies, using: Entities::Ci::JobRequest::Dependency expose :features + expose :dependencies do |job, options| + Entities::Ci::JobRequest::Dependency.represent(job.all_dependencies, options.merge(running_job: job)) + end end end end diff --git a/lib/api/entities/ci/lint/result.rb b/lib/api/entities/ci/lint/result.rb index 39039868bba..b44a6e13463 100644 --- a/lib/api/entities/ci/lint/result.rb +++ b/lib/api/entities/ci/lint/result.rb @@ -9,6 +9,7 @@ module API expose :errors expose :warnings expose :merged_yaml + expose :includes expose :jobs, if: -> (result, options) { options[:include_jobs] } end end diff --git a/lib/api/entities/ci/secure_file.rb b/lib/api/entities/ci/secure_file.rb index b60a1a6ac90..639615e5779 100644 --- a/lib/api/entities/ci/secure_file.rb +++ b/lib/api/entities/ci/secure_file.rb @@ -6,7 +6,6 @@ module API class SecureFile < Grape::Entity expose :id expose :name - expose :permissions expose :checksum expose :checksum_algorithm expose :created_at diff --git a/lib/api/entities/clusters/agent_token.rb b/lib/api/entities/clusters/agent_token.rb new file mode 100644 index 00000000000..e8cc1009361 --- /dev/null +++ b/lib/api/entities/clusters/agent_token.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +module API + module Entities + module Clusters + class AgentToken < AgentTokenBasic + expose :last_used_at + end + end + end +end diff --git a/lib/api/entities/clusters/agent_token_basic.rb b/lib/api/entities/clusters/agent_token_basic.rb new file mode 100644 index 00000000000..793ec8188b7 --- /dev/null +++ b/lib/api/entities/clusters/agent_token_basic.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +module API + module Entities + module Clusters + class AgentTokenBasic < Grape::Entity + expose :id + expose :name + expose :description + expose :agent_id + expose :status + expose :created_at + expose :created_by_user_id + end + end + end +end diff --git a/lib/api/entities/clusters/agent_token_with_token.rb b/lib/api/entities/clusters/agent_token_with_token.rb new file mode 100644 index 00000000000..8b84c80795f --- /dev/null +++ b/lib/api/entities/clusters/agent_token_with_token.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +module API + module Entities + module Clusters + class AgentTokenWithToken < AgentToken + expose :token + end + end + end +end diff --git a/lib/api/entities/environment.rb b/lib/api/entities/environment.rb index 91867f3403d..b1a720ac6bb 100644 --- a/lib/api/entities/environment.rb +++ b/lib/api/entities/environment.rb @@ -6,6 +6,7 @@ module API include RequestAwareEntity include Gitlab::Utils::StrongMemoize + expose :tier expose :project, using: Entities::BasicProjectDetails expose :last_deployment, using: Entities::Deployment, if: { last_deployment: true } expose :state diff --git a/lib/api/entities/plan_limit.rb b/lib/api/entities/plan_limit.rb index 9f4d1635998..94e50f19b35 100644 --- a/lib/api/entities/plan_limit.rb +++ b/lib/api/entities/plan_limit.rb @@ -3,6 +3,14 @@ module API module Entities class PlanLimit < Grape::Entity + expose :ci_pipeline_size + expose :ci_active_jobs + expose :ci_active_pipelines + expose :ci_project_subscriptions + expose :ci_pipeline_schedules + expose :ci_needs_size_limit + expose :ci_registered_group_runners + expose :ci_registered_project_runners expose :conan_max_file_size expose :generic_packages_max_file_size expose :helm_max_file_size @@ -11,6 +19,7 @@ module API expose :nuget_max_file_size expose :pypi_max_file_size expose :terraform_module_max_file_size + expose :storage_size_limit end end end diff --git a/lib/api/entities/project.rb b/lib/api/entities/project.rb index 60cc5167c41..9e216b0aed5 100644 --- a/lib/api/entities/project.rb +++ b/lib/api/entities/project.rb @@ -35,6 +35,10 @@ module API expose :members do |project| expose_url(api_v4_projects_members_path(id: project.id)) end + + expose :cluster_agents do |project| + expose_url(api_v4_projects_cluster_agents_path(id: project.id)) + end end expose :packages_enabled @@ -99,6 +103,7 @@ module API expose :ci_default_git_depth expose :ci_forward_deployment_enabled expose :ci_job_token_scope_enabled + expose :ci_separated_caches expose :public_builds, as: :public_jobs expose :build_git_strategy, if: lambda { |project, options| options[:user_can_admin_project] } do |project, options| project.build_allow_git_fetch ? 'fetch' : 'clone' @@ -121,6 +126,7 @@ module API expose :printing_merge_request_link_enabled expose :merge_method expose :squash_option + expose :enforce_auth_checks_on_uploads expose :suggestion_commit_message expose :merge_commit_template expose :squash_commit_template diff --git a/lib/api/entities/projects/topic.rb b/lib/api/entities/projects/topic.rb index d3d1cbec81c..976c307382a 100644 --- a/lib/api/entities/projects/topic.rb +++ b/lib/api/entities/projects/topic.rb @@ -6,6 +6,7 @@ module API class Topic < Grape::Entity expose :id expose :name + expose :title expose :description expose :total_projects_count expose :avatar_url do |topic, options| diff --git a/lib/api/entities/user.rb b/lib/api/entities/user.rb index ff711b4dec2..2366d137cc2 100644 --- a/lib/api/entities/user.rb +++ b/lib/api/entities/user.rb @@ -18,6 +18,9 @@ module API expose :following, if: ->(user, opts) { Ability.allowed?(opts[:current_user], :read_user_profile, user) } do |user| user.followees.size end + expose :is_followed, if: ->(user, opts) { Ability.allowed?(opts[:current_user], :read_user_profile, user) && opts[:current_user] } do |user, opts| + opts[:current_user].following?(user) + end expose :local_time do |user| local_time(user.timezone) end |