Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: merge the swagger files manually instead use nodetime swagger-combine (backport #4077) #4225

Merged
merged 6 commits into from
Jul 10, 2024

Commits on Jul 2, 2024

  1. feat: merge the swagger files manually instead use nodetime `swagger-…

    …combine` (#4077)
    
    * merge the Swagger files manually instead use nodejs swagger-combine
    
    * add changelog
    
    * remove unused function vars
    
    * remove unused error handler
    
    ---------
    
    Co-authored-by: Pantani <Pantani>
    (cherry picked from commit 6de2f33)
    
    # Conflicts:
    #	go.mod
    #	go.sum
    #	ignite/pkg/cosmosgen/generate_openapi.go
    #	ignite/pkg/nodetime/programs/swagger-combine/swagger-combine.go
    Pantani authored and mergify[bot] committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    9b87350 View commit details
    Browse the repository at this point in the history
  2. resolve conflicts

    Pantani committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    54ed8d4 View commit details
    Browse the repository at this point in the history
  3. fix doctor integration tests

    Pantani committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    c9504d8 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. Merge branch 'release/v28.x.y' into mergify/bp/release/v28.x.y/pr-4077

    # Conflicts:
    #	go.mod
    #	go.sum
    #	integration/doctor/testdata/missing-tools.go.txt
    Pantani committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    c8f5ab3 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/release/v28.x.y' into mergify/bp…

    …/release/v28.x.y/pr-4077
    
    # Conflicts:
    #	ignite/pkg/cosmosgen/generate_openapi.go
    #	ignite/templates/app/files/go.mod.plush
    Pantani committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    eec52cc View commit details
    Browse the repository at this point in the history
  3. fix doctor tests

    Pantani committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    e8c4935 View commit details
    Browse the repository at this point in the history