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

feat(platform): re-attempt platform automerge on github and gitlab #26567

Merged
merged 26 commits into from Mar 18, 2024
Merged

feat(platform): re-attempt platform automerge on github and gitlab #26567

merged 26 commits into from Mar 18, 2024

Commits on Jan 9, 2024

  1. feat(platform/github): re-attempt platform automerge

    @straub
    straub committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    77dfd20 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feat/github-refreshPr-tryPrAutomerge

    @straub
    straub committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    46f0aaa View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2024

  1. refactor(platform/github): use a new function, reattemptPlatformAutom… 

    …erge, instead
    @straub
    straub committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    5667cf4 View commit details
    Browse the repository at this point in the history

  2. refactor(platform/github): less renaming

    @straub
    straub committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    206bdf9 View commit details
    Browse the repository at this point in the history

  3. docs(platformAutomerge): address new GitHub Merge Queue behavior

    @straub
    straub committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    967e9bb View commit details
    Browse the repository at this point in the history

  4. docs(platformAutomerge): rm extra blank line

    @straub
    straub committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    c69d58e View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into feat/github-refreshPr-tryPrAutomerge

    @straub
    straub committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    d5591ca View commit details
    Browse the repository at this point in the history

  6. docs(platformAutomerge): fix typo

    @straub
    straub committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    f3417d0 View commit details
    Browse the repository at this point in the history

  7. fix(platform/github): correct inconsistent log message

    @straub
    straub committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    aa59178 View commit details
    Browse the repository at this point in the history

  8. refactor(platform/github): number -> prNo

    @straub
    straub committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    318b7c2 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2024

  1. refactor(workers/repository/update/branch): add boolean checks from t… 

    …ryPrAutomerge
    @straub
    straub committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    e2515dd View commit details
    Browse the repository at this point in the history

  2. fix(workers/repository/update/branch): use optional chaining on platf… 

    …ormOptions
    @straub
    straub committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    fafbc3a View commit details
    Browse the repository at this point in the history

  3. fix(workers/repository/update/branch): rm config.autoMergeAllowed che… 

    …ck, update mocks
    @straub
    straub committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    3023529 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into feat/github-refreshPr-tryPrAutomerge

    @straub
    straub committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    89227b7 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2024

  1. perf(platform/github): fetch PR from cache in reattemptPlatformAutomerge 

    Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
    @straub @viceice
    straub and viceice committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    5de6b57 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2024

  1. Update lib/modules/platform/github/index.ts

    @viceice
    viceice committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    e62dac6 View commit details
    Browse the repository at this point in the history

  2. Update lib/modules/platform/github/index.ts

    @viceice
    viceice committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    89b9f94 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into feat/github-refreshPr-tryPrAutomerge

    @viceice
    viceice committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    1f6fb0a View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2024

  1. Merge branch 'main' into feat/github-refreshPr-tryPrAutomerge

    @straub
    straub committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    3eb4a39 View commit details
    Browse the repository at this point in the history

  2. test(platform/github): add restGetPrList to mocks

    @straub
    straub committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    5da6078 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2024

  1. Merge branch 'main' into feat/github-refreshPr-tryPrAutomerge

    @straub
    straub committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    2d9d267 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2024

  1. Merge branch 'main' into feat/github-refreshPr-tryPrAutomerge

    @straub
    straub committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    1d97360 View commit details
    Browse the repository at this point in the history

  2. refactor(platform/gitlab): move automerge re-attempt from updatePr to… 

    … reattemptPlatformAutomerge
    @straub
    straub committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    71550f3 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into feat/github-refreshPr-tryPrAutomerge

    @straub
    straub committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    d556665 View commit details
    Browse the repository at this point in the history

  4. test(platform/gitlab): resolve coverage issue

    @straub
    straub committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    b4d3419 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2024

  1. Merge branch 'main' into feat/github-refreshPr-tryPrAutomerge

    @straub
    straub committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    aa67c3e View commit details
    Browse the repository at this point in the history