diff options
Diffstat (limited to 'app/serializers')
-rw-r--r-- | app/serializers/analytics_stage_entity.rb | 6 | ||||
-rw-r--r-- | app/serializers/cluster_application_entity.rb | 4 | ||||
-rw-r--r-- | app/serializers/fork_namespace_entity.rb | 8 | ||||
-rw-r--r-- | app/serializers/issue_board_entity.rb | 2 | ||||
-rw-r--r-- | app/serializers/member_serializer.rb | 2 | ||||
-rw-r--r-- | app/serializers/merge_request_diff_entity.rb | 8 |
6 files changed, 13 insertions, 17 deletions
diff --git a/app/serializers/analytics_stage_entity.rb b/app/serializers/analytics_stage_entity.rb index eb38b90fb18..8a96eb83a3f 100644 --- a/app/serializers/analytics_stage_entity.rb +++ b/app/serializers/analytics_stage_entity.rb @@ -8,9 +8,5 @@ class AnalyticsStageEntity < Grape::Entity expose :legend expose :description - expose :project_median, as: :value do |stage| - # median returns a BatchLoader instance which we first have to unwrap by using to_f - # we use to_f to make sure results below 1 are presented to the end-user - stage.project_median.to_f.nonzero? ? distance_of_time_in_words(stage.project_median) : nil - end + expose :project_median, as: :value end diff --git a/app/serializers/cluster_application_entity.rb b/app/serializers/cluster_application_entity.rb index 6b9a3ce114b..f57ac4af113 100644 --- a/app/serializers/cluster_application_entity.rb +++ b/app/serializers/cluster_application_entity.rb @@ -10,15 +10,11 @@ class ClusterApplicationEntity < Grape::Entity expose :hostname, if: -> (e, _) { e.respond_to?(:hostname) } expose :email, if: -> (e, _) { e.respond_to?(:email) } expose :stack, if: -> (e, _) { e.respond_to?(:stack) } - expose :modsecurity_enabled, if: -> (e, _) { e.respond_to?(:modsecurity_enabled) } expose :update_available?, as: :update_available, if: -> (e, _) { e.respond_to?(:update_available?) } expose :can_uninstall?, as: :can_uninstall expose :available_domains, using: Serverless::DomainEntity, if: -> (e, _) { e.respond_to?(:available_domains) } expose :pages_domain, using: Serverless::DomainEntity, if: -> (e, _) { e.respond_to?(:pages_domain) } - expose :modsecurity_mode, if: -> (e, _) { e.respond_to?(:modsecurity_mode) } expose :host, if: -> (e, _) { e.respond_to?(:host) } expose :port, if: -> (e, _) { e.respond_to?(:port) } expose :protocol, if: -> (e, _) { e.respond_to?(:protocol) } - expose :waf_log_enabled, if: -> (e, _) { e.respond_to?(:waf_log_enabled) } - expose :cilium_log_enabled, if: -> (e, _) { e.respond_to?(:cilium_log_enabled) } end diff --git a/app/serializers/fork_namespace_entity.rb b/app/serializers/fork_namespace_entity.rb index fbcdf91a1af..2be37d23a05 100644 --- a/app/serializers/fork_namespace_entity.rb +++ b/app/serializers/fork_namespace_entity.rb @@ -13,7 +13,7 @@ class ForkNamespaceEntity < Grape::Entity end expose :forked_project_path do |namespace, options| - if forked_project = namespace.find_fork_of(options[:project]) + if forked_project = options.dig(:forked_projects, namespace.id) project_path(forked_project) end end @@ -31,7 +31,11 @@ class ForkNamespaceEntity < Grape::Entity end expose :can_create_project do |namespace, options| - options[:current_user].can?(:create_projects, namespace) + if Feature.enabled?(:fork_project_form, options[:project], default_enabled: :yaml) + true + else + options[:current_user].can?(:create_projects, namespace) + end end private diff --git a/app/serializers/issue_board_entity.rb b/app/serializers/issue_board_entity.rb index 17a36f5fb07..4b9c48f3f7c 100644 --- a/app/serializers/issue_board_entity.rb +++ b/app/serializers/issue_board_entity.rb @@ -17,7 +17,7 @@ class IssueBoardEntity < Grape::Entity end expose :project do |issue| - API::Entities::Project.represent issue.project, only: [:id, :path] + API::Entities::Project.represent issue.project, only: [:id, :path, :path_with_namespace] end expose :milestone, if: -> (issue) { issue.milestone } do |issue| diff --git a/app/serializers/member_serializer.rb b/app/serializers/member_serializer.rb index 462f6be5d04..ad258b0ef1e 100644 --- a/app/serializers/member_serializer.rb +++ b/app/serializers/member_serializer.rb @@ -4,7 +4,7 @@ class MemberSerializer < BaseSerializer entity MemberEntity def represent(members, opts = {}) - Members::LastGroupOwnerAssigner.new(opts[:group], members).execute unless opts[:source].is_a?(Project) + LastGroupOwnerAssigner.new(opts[:group], members).execute unless opts[:source].is_a?(Project) super(members, opts) end diff --git a/app/serializers/merge_request_diff_entity.rb b/app/serializers/merge_request_diff_entity.rb index aa0ac7d2a7e..e197c3d0fbb 100644 --- a/app/serializers/merge_request_diff_entity.rb +++ b/app/serializers/merge_request_diff_entity.rb @@ -6,13 +6,13 @@ class MergeRequestDiffEntity < Grape::Entity include MergeRequestsHelper expose :version_index do |merge_request_diff| - @merge_request_diffs = options[:merge_request_diffs] + merge_request_diffs = options[:merge_request_diffs] diff = options[:merge_request_diff] - next unless diff.present? - next unless @merge_request_diffs.size > 1 + next unless merge_request_diffs.include?(diff) + next unless merge_request_diffs.size > 1 - version_index(merge_request_diff) + merge_request_diffs.size - merge_request_diffs.index(merge_request_diff) end expose :created_at |