🐛 Fix forbidden terms to unblock main#34799
Merged
kristoferbaxter merged 1 commit intoampproject:mainfrom Jun 9, 2021
Merged
Conversation
jridgewell
approved these changes
Jun 9, 2021
rcebulko
approved these changes
Jun 9, 2021
rcebulko
reviewed
Jun 9, 2021
| 'ads/_a4a-config.js', | ||
| 'build-system/server/amp4test.js', | ||
| 'build-system/server/app-index/amphtml-helpers.js', | ||
| 'build-system/server/app-utils.js', |
Contributor
There was a problem hiding this comment.
Was this reverted line intentional?
Member
Author
There was a problem hiding this comment.
Yes, #34754 removed direct mentions to cdn.ampproject in that file (replacing it with a regex, so now it's cdn\\.ampproject instead) and that also broke the checks
rcebulko
reviewed
Jun 9, 2021
| ], | ||
| }, | ||
| 'AMP_EXP': { | ||
| '\\bAMP_EXP\\b': { |
Contributor
There was a problem hiding this comment.
nit for a follow-up: just one rule '\\b(__)?AMP_EXP\\b'
Member
Author
There was a problem hiding this comment.
Ugh this is almost done passing the checks... wanna put that in your followup PR? :D
rileyajones
approved these changes
Jun 9, 2021
westonruter
added a commit
to westonruter/amphtml
that referenced
this pull request
Jun 11, 2021
…ebook-like-bento-version * 'main' of github.com:ampproject/amphtml: minor updates + fix broken links (ampproject#34840) Add "wrapper": "bento" option to Bento components (ampproject#34838) ♻️ Move src/layout into core to unblock buildDOM for amp-layout (ampproject#34818) ♿ Apply `lang="en"` to relevant snippets in `test/` (ampproject#34768) Bento: Enable `npm` for `amp-video` (ampproject#34822) ✨[story-ads] Introduce new yellow segment progress bar v2 (ampproject#34804) SwG Release (ampproject#34825) 📦 Update build-system devDependencies to v7.14.5 (ampproject#34802) Disable viewport warnings in experiment. (ampproject#34809) Apply lang="en" to examples/ (ampproject#34759) ✨ [Amp story] Scaffold desktop one panel experiment (ampproject#34755) ♻️ Migrate Style and DOM helpers into core/DOM + type-checking (ampproject#34681) 🏗 Don't pull all externs into experiments (ampproject#34800) typechecking: remove pride as not compatible with rest of strategy (ampproject#34787) Fix forbidden terms to unblock `main` (ampproject#34799)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.