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

fix(3scale): merge api docs for the same service #1249

Conversation

AndrienkoAleksandr
Copy link
Contributor

@AndrienkoAleksandr AndrienkoAleksandr commented Sep 18, 2024

Hey, I just made a Pull Request!

What does this pull request do:

Fixes: https://issues.redhat.com/browse/RHIDP-2903

Demo

https://youtu.be/yHUW7Qq2VVo

✔️ Checklist

  • A changeset describing the change and affected packages. (more info)
  • Added or updated documentation
  • Tests for new functionality and regression tests for bug fixes
  • Screenshots attached (for UI changes)
  • All your commits have a Signed-off-by line in the message. (more info)

@backstage-goalie
Copy link
Contributor

backstage-goalie bot commented Sep 18, 2024

Changed Packages

Package Name Package Path Changeset Bump Current Version
@backstage-community/plugin-3scale-backend workspaces/3scale/plugins/3scale-backend major v2.0.0

@AndrienkoAleksandr AndrienkoAleksandr marked this pull request as ready for review September 19, 2024 14:33
@AndrienkoAleksandr AndrienkoAleksandr requested a review from a team as a code owner September 19, 2024 14:34
@04kash
Copy link
Contributor

04kash commented Sep 19, 2024

@AndrienkoAleksandr can you add a changeset? You can add it by running yarn changeset from the 3scale workspace

@AndrienkoAleksandr
Copy link
Contributor Author

I attached demo.

@04kash
Copy link
Contributor

04kash commented Sep 25, 2024

@AndrienkoAleksandr can you resolve the conflicts?

@AndrienkoAleksandr AndrienkoAleksandr force-pushed the mergeAndConvert3scaleDocsForTheSameService branch from c74cde1 to 1c424b7 Compare September 26, 2024 15:03
@AndrienkoAleksandr
Copy link
Contributor Author

@04kash I resolved merge conflict.

@04kash
Copy link
Contributor

04kash commented Sep 26, 2024

@nickboldt can you trigger the workflow?

@nickboldt nickboldt enabled auto-merge (squash) September 26, 2024 16:01
auto-merge was automatically disabled September 26, 2024 22:37

Head branch was pushed to by a user without write access

@nickboldt nickboldt enabled auto-merge (squash) October 1, 2024 10:27
Signed-off-by: Oleksandr Andriienko <oandriie@redhat.com>
Signed-off-by: Oleksandr Andriienko <oandriie@redhat.com>
Signed-off-by: Oleksandr Andriienko <oandriie@redhat.com>
Signed-off-by: Oleksandr Andriienko <oandriie@redhat.com>
Signed-off-by: Oleksandr Andriienko <oandriie@redhat.com>
Signed-off-by: Oleksandr Andriienko <oandriie@redhat.com>
Signed-off-by: Oleksandr Andriienko <oandriie@redhat.com>
Signed-off-by: Oleksandr Andriienko <oandriie@redhat.com>
@BethGriggs BethGriggs force-pushed the mergeAndConvert3scaleDocsForTheSameService branch from 1f75b55 to 44333c9 Compare October 2, 2024 13:51
@BethGriggs BethGriggs disabled auto-merge October 2, 2024 13:51
@BethGriggs BethGriggs merged commit d8c8238 into backstage:main Oct 2, 2024
12 checks passed
karthikjeeyar pushed a commit to karthikjeeyar/community-plugins that referenced this pull request Oct 28, 2024
* fix(3scale): merge api docs for the same service
* fix(3scale): merge API docs titles and descriptions
* fix(3scale): fix title bug, improve tests
* fix(3scale): add changeset
* fix(3scale): remove console.log
* fix(3scale): add license headers
* fix(3scale): remove not working tsc command, use build instead of it
* fix(3scale): dedupe 3scale yarn.lock file

Signed-off-by: Oleksandr Andriienko <oandriie@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants