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

AMP Stories: The Next Iteration #1884

Merged
merged 1,395 commits into from
May 21, 2019
Merged

AMP Stories: The Next Iteration #1884

merged 1,395 commits into from
May 21, 2019

Conversation

westonruter
Copy link
Member

@westonruter westonruter commented Feb 20, 2019

This PR squashes the commits from #1215 to serve as the basis for the beta iteration for AMP Stories. The code in the amp-stories branch reflects an alpha state of the feature which we'll now be iterating on as part of the AMP Stories 1.0.0-beta project. The squashed commit allows us to start working with a clean PR and branch (amp-stories-redux) to merge sub-PRs into.

Shortlog of commit authors as part of squash of commits from PR #1215:

Count Author
149 Miina Sikk (@miina)
65 Mike Crantea (@mehigh)
33 Weston Ruter (@westonruter)
29 Jacob Schweitzer (@jacobschweitzer)
4 Shannon MacMillan (@bluestormcreative)

Fixes #968.

@googlebot googlebot added the cla: yes Signed the Google CLA label Feb 20, 2019
@westonruter
Copy link
Member Author

@swissspidy Would you please merge develop back into this branch to resolve the merge conflicts?

@googlebot
Copy link

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of all the commit author(s), set the cla label to yes (if enabled on your project), and then merge this pull request when appropriate.

ℹ️ Googlers: Go here for more info.

@googlebot googlebot added cla: no Has not signed the Google CLA and removed cla: yes Signed the Google CLA labels Feb 28, 2019
@swissspidy
Copy link
Collaborator

@googlebot can you check again?

@swissspidy swissspidy added cla: yes Signed the Google CLA and removed cla: no Has not signed the Google CLA labels Feb 28, 2019
@googlebot
Copy link

A Googler has manually verified that the CLAs look good.

(Googler, please make sure the reason for overriding the CLA status is clearly documented in these comments.)

ℹ️ Googlers: Go here for more info.

@swissspidy
Copy link
Collaborator

(Googler, please make sure the reason for overriding the CLA status is clearly documented in these comments.)

There was a false positive because of a merge commit, which was done by [email protected].

@googlebot
Copy link

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of all the commit author(s), set the cla label to yes (if enabled on your project), and then merge this pull request when appropriate.

ℹ️ Googlers: Go here for more info.

@googlebot googlebot added cla: no Has not signed the Google CLA and removed cla: yes Signed the Google CLA labels Feb 28, 2019
@swissspidy swissspidy added the cla: yes Signed the Google CLA label Mar 14, 2019
@googlebot
Copy link

A Googler has manually verified that the CLAs look good.

(Googler, please make sure the reason for overriding the CLA status is clearly documented in these comments.)

ℹ️ Googlers: Go here for more info.

@googlebot googlebot removed the cla: no Has not signed the Google CLA label Mar 14, 2019
@googlebot
Copy link

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of all the commit author(s), set the cla label to yes (if enabled on your project), and then merge this pull request when appropriate.

ℹ️ Googlers: Go here for more info.

@googlebot googlebot added cla: no Has not signed the Google CLA and removed cla: yes Signed the Google CLA labels Mar 15, 2019
@swissspidy swissspidy added cla: yes Signed the Google CLA and removed cla: no Has not signed the Google CLA labels Mar 15, 2019
@googlebot
Copy link

A Googler has manually verified that the CLAs look good.

(Googler, please make sure the reason for overriding the CLA status is clearly documented in these comments.)

ℹ️ Googlers: Go here for more info.

@googlebot
Copy link

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of all the commit author(s), set the cla label to yes (if enabled on your project), and then merge this pull request when appropriate.

ℹ️ Googlers: Go here for more info.

@googlebot googlebot added cla: no Has not signed the Google CLA and removed cla: yes Signed the Google CLA labels Mar 15, 2019
@swissspidy
Copy link
Collaborator

@googlebot Please re-check

westonruter and others added 9 commits May 21, 2019 10:39
…es-redux

* 'develop' of github.com:ampproject/amp-wp:
  Update dependency @wordpress/i18n to v3.4.0
As Pascal pointed out,
this data isn't needed in that case.
…height

Increase default minimum block height for meta blocks
A unit test failed,
so update it for the latest change.
Clean up the state after each test,
to ensure that there isn't a failed test.
Don't export the Latest Stories data in the AMP Story editor
@westonruter westonruter added cla: yes Signed the Google CLA and removed cla: no Has not signed the Google CLA labels May 21, 2019
@googlebot
Copy link

A Googler has manually verified that the CLAs look good.

(Googler, please make sure the reason for overriding the CLA status is clearly documented in these comments.)

ℹ️ Googlers: Go here for more info.

@googlebot googlebot added cla: no Has not signed the Google CLA and removed cla: yes Signed the Google CLA labels May 21, 2019
@westonruter westonruter added this to the v1.2 milestone May 21, 2019
@westonruter westonruter added cla: yes Signed the Google CLA and removed cla: no Has not signed the Google CLA labels May 21, 2019
@googlebot
Copy link

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of all the commit author(s), set the cla label to yes (if enabled on your project), and then merge this pull request when appropriate.

ℹ️ Googlers: Go here for more info.

@googlebot googlebot added cla: no Has not signed the Google CLA and removed cla: yes Signed the Google CLA labels May 21, 2019
Copy link
Contributor

@kienstra kienstra left a comment

Choose a reason for hiding this comment

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

Approved

Hi @westonruter,
This looks good.

This is probably expected, because this probably isn't the release PR.

But running php bin/verify-version-consistency.php shows:

Version references:
{
    "readme.txt#stable-tag": "1.1.1",
    "amp.php#metadata": "1.2-alpha1",
    "AMP__VERSION": "1.2-alpha1"
}
Error: Not all version references have been updated.

@westonruter westonruter added cla: yes Signed the Google CLA and removed cla: no Has not signed the Google CLA labels May 21, 2019
@googlebot
Copy link

A Googler has manually verified that the CLAs look good.

(Googler, please make sure the reason for overriding the CLA status is clearly documented in these comments.)

ℹ️ Googlers: Go here for more info.

@googlebot googlebot added cla: no Has not signed the Google CLA and removed cla: yes Signed the Google CLA labels May 21, 2019
@westonruter westonruter merged commit c442b38 into develop May 21, 2019
@westonruter westonruter added cla: yes Signed the Google CLA and removed cla: no Has not signed the Google CLA labels May 21, 2019
@westonruter westonruter deleted the amp-stories-redux branch May 21, 2019 23:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes Signed the Google CLA
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Implement AMP Stories
5 participants