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

Chore: Merge main to next-release/main #7332

Merged
merged 10 commits into from
Apr 27, 2024

Conversation

jacoblogan
Copy link
Contributor

@jacoblogan jacoblogan commented Apr 26, 2024

Description of changes:

Bi-weekly merge of main into next-release/main

includes:

Related GitHub issue #, if available:

Instructions

If this PR should not be merged upon approval for any reason, please submit as a DRAFT

Which product(s) are affected by this PR (if applicable)?

  • amplify-cli
  • amplify-ui
  • amplify-studio
  • amplify-hosting
  • amplify-libraries

Which platform(s) are affected by this PR (if applicable)?

  • JS
  • Swift
  • Android
  • Flutter
  • React Native

Please add the product(s)/platform(s) affected to the PR title

Checks

  • Does this PR conform to the styleguide?

  • Does this PR include filetypes other than markdown or images? Please add or update unit tests accordingly.

  • Are any files being deleted with this PR? If so, have the needed redirects been created?

  • Are all links in MDX files using the MDX link syntax rather than HTML link syntax?

    ref: MDX: [link](https://docs.amplify.aws/)
    HTML: <a href="https://docs.amplify.aws/">link</a>

When this PR is ready to merge, please check the box below

  • Ready to merge

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

salihgueler and others added 6 commits April 26, 2024 13:02
* Update the flutter mobile support doc.

* Add file name.

* Add Safe Area.
* chore(main): replace Twitter logo with X logo

* update tests,snapshots, use x.com link instead of twitter.com
…links (#7292)

* fix: allow code elements to work in h2/h3 headings with anchor links

* update test

* add comments to describe logic
* allow tablist to be scrollable

* add scroll padding

* Remove scroll padding because firefox hates it
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This shouldn't be a gen2 page right? We would need to add this to src/pages/build-a-backend/storage or check to see if it already exists and then make sure it has the latest updates?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, I've removed the gen2 page completely. It looks like in the next-release/main branch that single page has been broken up into multiple sub pages.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the file got moved to here:

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch, updated

@jacoblogan jacoblogan enabled auto-merge (squash) April 26, 2024 23:36
@jacoblogan jacoblogan merged commit 025f084 into next-release/main Apr 27, 2024
5 checks passed
@jacoblogan jacoblogan deleted the merge-to-next-release branch April 27, 2024 00:01
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.

6 participants