Merge branch 'docs-api-doc-cleanup' into 'master'

General style cleanup og API docs top-level page

See merge request gitlab-org/gitlab!46896

app/services/packages/composer/version_parser_service.rb

@@ -9,7 +9,7 @@ module Packages
 
       def execute
         if @tag_name.present?
-          @tag_name.match(Gitlab::Regex.composer_package_version_regex).captures[0]
+          @tag_name.delete_prefix('v')
         elsif @branch_name.present?
           branch_sufix_or_prefix(@branch_name.match(Gitlab::Regex.composer_package_version_regex))
         end

changelogs/unreleased/240887-packages-composer-semver-not-fully-supported.yml

+---
+title: Allow semver versions in composer packages
+merge_request: 46301
+author:
+type: fixed

lib/gitlab/graphql/docs/helper.rb

@@ -81,11 +81,15 @@ module Gitlab
         # We are ignoring connections and built in types for now,
         # they should be added when queries are generated.
         def objects
-          graphql_object_types.select do |object_type|
+          object_types = graphql_object_types.select do |object_type|
             !object_type[:name]["Connection"] &&
               !object_type[:name]["Edge"] &&
               !object_type[:name]["__"]
           end
+
+          object_types.each do |type|
+            type[:fields] += type[:connections]
+          end
         end
 
         # We ignore the built-in enum types.

spec/services/packages/composer/version_parser_service_spec.rb

@@ -19,9 +19,11 @@ RSpec.describe Packages::Composer::VersionParserService do
       nil             | '1.7.x'      | '1.7.x-dev'
       'v1.0.0'        | nil          | '1.0.0'
       'v1.0'          | nil          | '1.0'
+      'v1.0.1+meta'   | nil          | '1.0.1+meta'
       '1.0'           | nil          | '1.0'
       '1.0.2'         | nil          | '1.0.2'
       '1.0.2-beta2'   | nil          | '1.0.2-beta2'
+      '1.0.1+meta'    | nil          | '1.0.1+meta'
     end
 
     with_them do