diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
tree | 544930fb309b30317ae9797a9683768705d664c4 /lib/api/entities | |
parent | 4b1de649d0168371549608993deac953eb692019 (diff) |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'lib/api/entities')
-rw-r--r-- | lib/api/entities/cluster.rb | 2 | ||||
-rw-r--r-- | lib/api/entities/feature.rb | 10 | ||||
-rw-r--r-- | lib/api/entities/feature_flag.rb | 4 | ||||
-rw-r--r-- | lib/api/entities/issue.rb | 1 | ||||
-rw-r--r-- | lib/api/entities/merge_request_basic.rb | 1 | ||||
-rw-r--r-- | lib/api/entities/note.rb | 1 | ||||
-rw-r--r-- | lib/api/entities/project.rb | 2 | ||||
-rw-r--r-- | lib/api/entities/project_import_status.rb | 5 | ||||
-rw-r--r-- | lib/api/entities/project_snippet.rb | 2 | ||||
-rw-r--r-- | lib/api/entities/project_statistics.rb | 1 | ||||
-rw-r--r-- | lib/api/entities/related_issue.rb | 2 |
11 files changed, 24 insertions, 7 deletions
diff --git a/lib/api/entities/cluster.rb b/lib/api/entities/cluster.rb index 67459092a33..b7e76e763f7 100644 --- a/lib/api/entities/cluster.rb +++ b/lib/api/entities/cluster.rb @@ -3,7 +3,7 @@ module API module Entities class Cluster < Grape::Entity - expose :id, :name, :created_at, :domain + expose :id, :name, :created_at, :domain, :enabled, :managed expose :provider_type, :platform_type, :environment_scope, :cluster_type, :namespace_per_environment expose :user, using: Entities::UserBasic expose :platform_kubernetes, using: Entities::Platform::Kubernetes diff --git a/lib/api/entities/feature.rb b/lib/api/entities/feature.rb index 618a7be9c7b..d1151849cd7 100644 --- a/lib/api/entities/feature.rb +++ b/lib/api/entities/feature.rb @@ -17,6 +17,16 @@ module API { key: gate.key, value: value } end.compact end + + class Definition < Grape::Entity + ::Feature::Definition::PARAMS.each do |param| + expose param + end + end + + expose :definition, using: Definition do |feature| + ::Feature::Definition.definitions[feature.name.to_sym] + end end end end diff --git a/lib/api/entities/feature_flag.rb b/lib/api/entities/feature_flag.rb index 82fdb20af00..f383eabd5dc 100644 --- a/lib/api/entities/feature_flag.rb +++ b/lib/api/entities/feature_flag.rb @@ -6,11 +6,11 @@ module API expose :name expose :description expose :active - expose :version, if: :feature_flags_new_version_enabled + expose :version expose :created_at expose :updated_at expose :scopes, using: FeatureFlag::LegacyScope - expose :strategies, using: FeatureFlag::Strategy, if: :feature_flags_new_version_enabled + expose :strategies, using: FeatureFlag::Strategy end end end diff --git a/lib/api/entities/issue.rb b/lib/api/entities/issue.rb index 5f2609cf68b..82102854394 100644 --- a/lib/api/entities/issue.rb +++ b/lib/api/entities/issue.rb @@ -43,6 +43,7 @@ module API end expose :moved_to_id + expose :service_desk_reply_to end end end diff --git a/lib/api/entities/merge_request_basic.rb b/lib/api/entities/merge_request_basic.rb index 69523e3637b..7f1b5b87725 100644 --- a/lib/api/entities/merge_request_basic.rb +++ b/lib/api/entities/merge_request_basic.rb @@ -27,6 +27,7 @@ module API expose(:downvotes) { |merge_request, options| issuable_metadata.downvotes } expose :author, :assignees, :assignee, using: Entities::UserBasic + expose :reviewers, if: -> (merge_request, _) { merge_request.allows_reviewers? }, using: Entities::UserBasic expose :source_project_id, :target_project_id expose :labels do |merge_request, options| if options[:with_labels_details] diff --git a/lib/api/entities/note.rb b/lib/api/entities/note.rb index f22ab73afd0..9a60c04220d 100644 --- a/lib/api/entities/note.rb +++ b/lib/api/entities/note.rb @@ -14,6 +14,7 @@ module API expose :created_at, :updated_at expose :system?, as: :system expose :noteable_id, :noteable_type + expose :commit_id, if: ->(note, options) { note.noteable_type == "MergeRequest" && note.is_a?(DiffNote) } expose :position, if: ->(note, options) { note.is_a?(DiffNote) } do |note| note.position.to_h diff --git a/lib/api/entities/project.rb b/lib/api/entities/project.rb index 82a44c75382..317caefe0a1 100644 --- a/lib/api/entities/project.rb +++ b/lib/api/entities/project.rb @@ -67,6 +67,8 @@ module API expose(:builds_access_level) { |project, options| project.project_feature.string_access_level(:builds) } expose(:snippets_access_level) { |project, options| project.project_feature.string_access_level(:snippets) } expose(:pages_access_level) { |project, options| project.project_feature.string_access_level(:pages) } + expose(:operations_access_level) { |project, options| project.project_feature.string_access_level(:operations) } + expose(:analytics_access_level) { |project, options| project.project_feature.string_access_level(:analytics) } expose :emails_disabled expose :shared_runners_enabled diff --git a/lib/api/entities/project_import_status.rb b/lib/api/entities/project_import_status.rb index f92593da3fa..e79c1cdf1a2 100644 --- a/lib/api/entities/project_import_status.rb +++ b/lib/api/entities/project_import_status.rb @@ -12,9 +12,8 @@ module API project.import_state&.relation_hard_failures(limit: 100) || [] end - # TODO: Use `expose_nil` once we upgrade the grape-entity gem - expose :import_error, if: lambda { |project, _ops| project.import_state&.last_error } do |project| - project.import_state.last_error + expose :import_error do |project, _options| + project.import_state&.last_error end end end diff --git a/lib/api/entities/project_snippet.rb b/lib/api/entities/project_snippet.rb index 8ed87e51375..253fcfcf38f 100644 --- a/lib/api/entities/project_snippet.rb +++ b/lib/api/entities/project_snippet.rb @@ -1,4 +1,4 @@ -# frozen_String_literal: true +# frozen_string_literal: true module API module Entities diff --git a/lib/api/entities/project_statistics.rb b/lib/api/entities/project_statistics.rb index 32201e88eaf..70980e670b0 100644 --- a/lib/api/entities/project_statistics.rb +++ b/lib/api/entities/project_statistics.rb @@ -10,6 +10,7 @@ module API expose :lfs_objects_size expose :build_artifacts_size, as: :job_artifacts_size expose :snippets_size + expose :packages_size end end end diff --git a/lib/api/entities/related_issue.rb b/lib/api/entities/related_issue.rb index 491c606bd49..60793fed5e0 100644 --- a/lib/api/entities/related_issue.rb +++ b/lib/api/entities/related_issue.rb @@ -5,6 +5,8 @@ module API class RelatedIssue < ::API::Entities::Issue expose :issue_link_id expose :issue_link_type, as: :link_type + expose :issue_link_created_at, as: :link_created_at + expose :issue_link_updated_at, as: :link_updated_at end end end |