1 files changed, 7 insertions, 4 deletions
diff --git a/lib/api/entities/release.rb b/lib/api/entities/release.rb
index f6c3dd5a509..94124352298 100644
--- a/lib/api/entities/release.rb
+++ b/lib/api/entities/release.rb
@@ -8,7 +8,7 @@ module API
       expose :name
       expose :tag, as: :tag_name, if: ->(_, _) { can_download_code? }
       expose :description
-      expose :description_html do |entity|
+      expose :description_html, unless: ->(_, _) { remove_description_html? } do |entity|
         MarkupHelper.markdown_field(entity, :description, current_user: options[:current_user])
       end
       expose :created_at
@@ -28,9 +28,7 @@ module API
       expose :assets do
         expose :assets_count, as: :count
         expose :sources, using: Entities::Releases::Source, if: ->(_, _) { can_download_code? }
-        expose :links, using: Entities::Releases::Link do |release, options|
-          release.links.sorted
-        end
+        expose :sorted_links, as: :links, using: Entities::Releases::Link
       end
       expose :evidences, using: Entities::Releases::Evidence, expose_nil: false, if: ->(_, _) { can_download_code? }
       expose :_links do
@@ -47,6 +45,11 @@ module API
       def can_read_milestone?
         Ability.allowed?(options[:current_user], :read_milestone, object.project)
       end
+
+      def remove_description_html?
+        ::Feature.enabled?(:remove_description_html_in_release_api, object.project, default_enabled: :yaml) &&
+          ::Feature.disabled?(:remove_description_html_in_release_api_override, object.project)
+      end
     end
   end
 end