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

Merge on successful apply #39

Merged
merged 16 commits into from
Oct 24, 2023
Merged

Merge on successful apply #39

merged 16 commits into from
Oct 24, 2023

Commits on Oct 16, 2023

  1. migrate to go uber mock 

    Signed-off-by: davidwin93 <dave.winiarski@zapier.com>
    @davidwin93
    davidwin93 committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    bdf19d0 View commit details
    Browse the repository at this point in the history

  2. add merge PR support to Github 

    Signed-off-by: davidwin93 <dave.winiarski@zapier.com>
    @davidwin93
    davidwin93 committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    9800c3f View commit details
    Browse the repository at this point in the history

  3. add merge MR support to Gitlab 

    Signed-off-by: davidwin93 <dave.winiarski@zapier.com>
    @davidwin93
    davidwin93 committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    d69cab3 View commit details
    Browse the repository at this point in the history

  4. update dependencies 

    Signed-off-by: davidwin93 <dave.winiarski@zapier.com>
    @davidwin93
    davidwin93 committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    45797cf View commit details
    Browse the repository at this point in the history

  5. add check on project and global levels if auto merge is enabled 

    Signed-off-by: davidwin93 <dave.winiarski@zapier.com>
    @davidwin93
    davidwin93 committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    8071bdd View commit details
    Browse the repository at this point in the history

  6. update MR comments to indicate if auto merge is enabled 

    Signed-off-by: davidwin93 <dave.winiarski@zapier.com>
    @davidwin93
    davidwin93 committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    66c18e4 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2023

  1. add test coverage for project level auto merge 

    Signed-off-by: davidwin93 <dave.winiarski@zapier.com>
    @davidwin93
    davidwin93 committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    e1c394b View commit details
    Browse the repository at this point in the history

  2. refactor help text for MR comments 

    Signed-off-by: davidwin93 <dave.winiarski@zapier.com>
    @davidwin93
    davidwin93 committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    2438df8 View commit details
    Browse the repository at this point in the history

  3. update docs 

    Signed-off-by: davidwin93 <dave.winiarski@zapier.com>
    @davidwin93
    davidwin93 committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    3073ecb View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2023

  1. address code review comments 

    Signed-off-by: davidwin93 <dave.winiarski@zapier.com>
    @davidwin93
    davidwin93 committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    eaed084 View commit details
    Browse the repository at this point in the history

  2. update env var that allows auto merge 

    Signed-off-by: davidwin93 <dave.winiarski@zapier.com>
    @davidwin93
    davidwin93 committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    9afdb2d View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2023

  1. auto merge if apply has no changes 

    Signed-off-by: davidwin93 <dave.winiarski@zapier.com>
    @davidwin93
    davidwin93 committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    6495533 View commit details
    Browse the repository at this point in the history

  2. check if apply was targeted before merging even if empty. 

    Signed-off-by: davidwin93 <dave.winiarski@zapier.com>
    @davidwin93
    davidwin93 committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    aed8c9e View commit details
    Browse the repository at this point in the history

  3. add additional unit tests for auto merge 

    Signed-off-by: davidwin93 <dave.winiarski@zapier.com>
    @davidwin93
    davidwin93 committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    7b842ef View commit details
    Browse the repository at this point in the history

  4. add commit sha to msg id to allow new commits to run without waiting … 

    …for nats dedupe timeout

Signed-off-by: davidwin93 <dave.winiarski@zapier.com>
    @davidwin93
    davidwin93 committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    cb5681c View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2023

  1. use constants instead of hardcoded values 

    Signed-off-by: davidwin93 <dave.winiarski@zapier.com>
    @davidwin93
    davidwin93 committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    b2892d0 View commit details
    Browse the repository at this point in the history