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.

Sign up for GitHub

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

Jump to bottom

Revert part of #19947 and #19680 which caused race condition for amp-analytics layout #19963

Merged
merged 7 commits into from
Dec 22, 2018
Merged

Revert part of #19947 and #19680 which caused race condition for amp-analytics layout #19963

merged 7 commits into from
Dec 22, 2018

Commits on Dec 18, 2018

  1. put amp-analytics > 3 viewports away in integration test

    @lannka
    lannka committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    c5a06d4 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2018

  1. Merge branch 'master' into analytics-3-viewport-test

    @lannka
    lannka committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    175fd9d View commit details
    Browse the repository at this point in the history

  2. save a line

    @lannka
    lannka committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    c5a733d View commit details
    Browse the repository at this point in the history

  3. increase timeout, try to fix test

    @lannka
    lannka committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    a49103d View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2018

  1. Merge branch 'master' into analytics-3-viewport-test

    @lannka
    lannka committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    8e284c7 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2018

  1. merge

    @lannka
    lannka committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    5993415 View commit details
    Browse the repository at this point in the history

  2. Revert part of ampproject#19947 and ampproject#19680

    @lannka
    lannka committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    6871c4b View commit details
    Browse the repository at this point in the history