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(onboarding): merge onboardingBranch into baseBranch #20893

Merged
merged 70 commits into from May 18, 2023
Merged

feat(onboarding): merge onboardingBranch into baseBranch #20893

merged 70 commits into from May 18, 2023

Commits on Mar 13, 2023

  1. merge onboarding in base

    @RahulGautamSingh
    RahulGautamSingh committed Mar 13, 2023
    Copy the full SHA
    a0ba81b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feat/merge-onboarding-into-base

    @RahulGautamSingh
    RahulGautamSingh committed Mar 13, 2023
    Copy the full SHA
    aed5680 View commit details
    Browse the repository at this point in the history

  3. add conflict-check

    @RahulGautamSingh
    RahulGautamSingh committed Mar 13, 2023
    Copy the full SHA
    c596f23 View commit details
    Browse the repository at this point in the history

  4. remove checkoutBranch

    @RahulGautamSingh
    RahulGautamSingh committed Mar 13, 2023
    Copy the full SHA
    66b6a16 View commit details
    Browse the repository at this point in the history

  5. do not enforece ff

    @RahulGautamSingh
    RahulGautamSingh committed Mar 13, 2023
    Copy the full SHA
    b73a5fc View commit details
    Browse the repository at this point in the history

  6. ensure comment if conflicted 

    Adds a comment informing that branch can't be updated due to conflicts instead if updating the pr-body
    @RahulGautamSingh
    RahulGautamSingh committed Mar 13, 2023
    Copy the full SHA
    f66d7b7 View commit details
    Browse the repository at this point in the history

  7. move ensureComment before merging

    @RahulGautamSingh
    RahulGautamSingh committed Mar 13, 2023
    Copy the full SHA
    699b065 View commit details
    Browse the repository at this point in the history

  8. add tests

    @RahulGautamSingh
    RahulGautamSingh committed Mar 13, 2023
    Copy the full SHA
    c9d6585 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'main' into feat/merge-onboarding-into-base

    @RahulGautamSingh
    RahulGautamSingh committed Mar 13, 2023
    Copy the full SHA
    6a6d2e9 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2023

  1. Apply suggestions from code review 

    Co-authored-by: Rhys Arkins <rhys@arkins.net>
    @RahulGautamSingh @rarkins
    RahulGautamSingh and rarkins committed Mar 14, 2023
    Copy the full SHA
    1af85ba View commit details
    Browse the repository at this point in the history

  2. remove automatic rebasing

    @RahulGautamSingh
    RahulGautamSingh committed Mar 14, 2023
    Copy the full SHA
    fd817db View commit details
    Browse the repository at this point in the history

  3. skip pr-update when conflicted

    @RahulGautamSingh
    RahulGautamSingh committed Mar 14, 2023
    Copy the full SHA
    d7828ef View commit details
    Browse the repository at this point in the history

  4. update test

    @RahulGautamSingh
    RahulGautamSingh committed Mar 14, 2023
    Copy the full SHA
    cd2576d View commit details
    Browse the repository at this point in the history

  5. move conflict-comment in ensureOnboardingPr()

    @RahulGautamSingh
    RahulGautamSingh committed Mar 14, 2023
    Copy the full SHA
    94e171d View commit details
    Browse the repository at this point in the history

  6. coverage + remove comment

    @RahulGautamSingh
    RahulGautamSingh committed Mar 14, 2023
    Copy the full SHA
    597e979 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2023

  1. Update lib/workers/repository/onboarding/pr/index.ts

    @rarkins
    rarkins committed Mar 15, 2023
    Copy the full SHA
    826c763 View commit details
    Browse the repository at this point in the history

  2. Update lib/util/git/index.ts 

    Co-authored-by: Rhys Arkins <rhys@arkins.net>
    @RahulGautamSingh @rarkins
    RahulGautamSingh and rarkins committed Mar 15, 2023
    Copy the full SHA
    77471fd View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2023

  1. do not notify when modified

    @RahulGautamSingh
    RahulGautamSingh committed Mar 18, 2023
    Copy the full SHA
    aaa386a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feat/merge-onboarding-into-base' of https://github.com/… 

    …RahulGautamSingh/renovate into feat/merge-onboarding-into-base
    @RahulGautamSingh
    RahulGautamSingh committed Mar 18, 2023
    Copy the full SHA
    c1bef4e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into feat/merge-onboarding-into-base

    @RahulGautamSingh
    RahulGautamSingh committed Mar 18, 2023
    Copy the full SHA
    fe8afd6 View commit details
    Browse the repository at this point in the history

  4. add test

    @RahulGautamSingh
    RahulGautamSingh committed Mar 18, 2023
    Copy the full SHA
    9f70e5c View commit details
    Browse the repository at this point in the history

  5. Merge branch 'feat/merge-onboarding-into-base' of https://github.com/… 

    …RahulGautamSingh/renovate into feat/merge-onboarding-into-base
    @RahulGautamSingh
    RahulGautamSingh committed Mar 18, 2023
    Copy the full SHA
    80ac8ab View commit details
    Browse the repository at this point in the history

  6. add new test

    @RahulGautamSingh
    RahulGautamSingh committed Mar 18, 2023
    Copy the full SHA
    1bbcbfb View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2023

  1. Merge branch 'main' into feat/merge-onboarding-into-base

    @rarkins
    rarkins committed Mar 27, 2023
    Copy the full SHA
    0926dff View commit details
    Browse the repository at this point in the history

  2. invalidate cachedExtract when onboardingBranch is modified

    @RahulGautamSingh
    RahulGautamSingh committed Mar 27, 2023
    Copy the full SHA
    05ddfac View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2023

  1. refactor code

    @RahulGautamSingh
    RahulGautamSingh committed Mar 28, 2023
    Copy the full SHA
    85f0bde View commit details
    Browse the repository at this point in the history

  2. add and update tests

    @RahulGautamSingh
    RahulGautamSingh committed Mar 28, 2023
    Copy the full SHA
    f04590a View commit details
    Browse the repository at this point in the history

  3. renamed onboardingSha -> onboardingBranchSha

    @RahulGautamSingh
    RahulGautamSingh committed Mar 28, 2023
    Copy the full SHA
    3a3c0b6 View commit details
    Browse the repository at this point in the history

  4. move logic to onboarding/index

    @RahulGautamSingh
    RahulGautamSingh committed Mar 28, 2023
    Copy the full SHA
    50738ee View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into feat/merge-onboarding-into-base

    @RahulGautamSingh
    RahulGautamSingh committed Mar 28, 2023
    Copy the full SHA
    9f40ad8 View commit details
    Browse the repository at this point in the history

  6. update tests

    @RahulGautamSingh
    RahulGautamSingh committed Mar 28, 2023
    Copy the full SHA
    4cfaf3e View commit details
    Browse the repository at this point in the history

  7. add tests

    @RahulGautamSingh
    RahulGautamSingh committed Mar 28, 2023
    Copy the full SHA
    b1aee87 View commit details
    Browse the repository at this point in the history

  8. revert extra changes

    @RahulGautamSingh
    RahulGautamSingh committed Mar 28, 2023
    Copy the full SHA
    8f5e33c View commit details
    Browse the repository at this point in the history

  9. refactor

    @RahulGautamSingh
    RahulGautamSingh committed Mar 28, 2023
    Copy the full SHA
    58dcf0f View commit details
    Browse the repository at this point in the history

  10. Apply suggestions from code review

    @RahulGautamSingh
    RahulGautamSingh committed Mar 28, 2023
    Copy the full SHA
    0b19099 View commit details
    Browse the repository at this point in the history

  11. apply suggestions

    @RahulGautamSingh
    RahulGautamSingh committed Mar 28, 2023
    Copy the full SHA
    35d9e7d View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2023

  1. Merge branch 'main' into feat/merge-onboarding-into-base

    @RahulGautamSingh
    RahulGautamSingh committed Apr 8, 2023
    Copy the full SHA
    30b4828 View commit details
    Browse the repository at this point in the history

  2. cache onboarding modified and conflicted states

    @RahulGautamSingh
    RahulGautamSingh committed Apr 8, 2023
    Copy the full SHA
    1f78d66 View commit details
    Browse the repository at this point in the history

  3. update tests

    @RahulGautamSingh
    RahulGautamSingh committed Apr 8, 2023
    Copy the full SHA
    f0cf351 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into feat/merge-onboarding-into-base

    @RahulGautamSingh
    RahulGautamSingh committed Apr 8, 2023
    Copy the full SHA
    e618ed4 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2023

  1. apply suggestions

    @RahulGautamSingh
    RahulGautamSingh committed Apr 11, 2023
    Copy the full SHA
    80830da View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feat/merge-onboarding-into-base

    @RahulGautamSingh
    RahulGautamSingh committed Apr 11, 2023
    Copy the full SHA
    6378d10 View commit details
    Browse the repository at this point in the history

  3. fix: check modified & conflict separately 

    since hasONboardingBranchChanged() is not same as branch being modified they should be tested checked separately and not like before where we only checked for conflict when branch was modified
    @RahulGautamSingh
    RahulGautamSingh committed Apr 11, 2023
    Copy the full SHA
    5a6e148 View commit details
    Browse the repository at this point in the history

  4. fix: update logic 

    use separate fns to calc modified and changed
    @RahulGautamSingh
    RahulGautamSingh committed Apr 11, 2023
    Copy the full SHA
    695fdb3 View commit details
    Browse the repository at this point in the history

  5. fix: lint issue

    @RahulGautamSingh
    RahulGautamSingh committed Apr 11, 2023
    Copy the full SHA
    00b652c View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2023

  1. fix: delete onboardingCache if onboardingPr closed

    @RahulGautamSingh
    RahulGautamSingh committed Apr 12, 2023
    Copy the full SHA
    7068647 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feat/merge-onboarding-into-base

    @RahulGautamSingh
    RahulGautamSingh committed Apr 12, 2023
    Copy the full SHA
    474e79d View commit details
    Browse the repository at this point in the history

  3. fix: typo

    @RahulGautamSingh
    RahulGautamSingh committed Apr 12, 2023
    Copy the full SHA
    e14ec45 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2023

  1. refactor

    @RahulGautamSingh
    RahulGautamSingh committed Apr 15, 2023
    Copy the full SHA
    56c4eaf View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2023

  1. fix test

    @RahulGautamSingh
    RahulGautamSingh committed Apr 19, 2023
    Copy the full SHA
    e51db9b View commit details
    Browse the repository at this point in the history

  2. refactor

    @RahulGautamSingh
    RahulGautamSingh committed Apr 19, 2023
    Copy the full SHA
    4cfddc6 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into feat/merge-onboarding-into-base

    @RahulGautamSingh
    RahulGautamSingh committed Apr 19, 2023
    Copy the full SHA
    0a26038 View commit details
    Browse the repository at this point in the history

  4. use is.undefined

    @RahulGautamSingh
    RahulGautamSingh committed Apr 19, 2023
    Copy the full SHA
    4bde23b View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2023

  1. Merge branch 'main' into feat/merge-onboarding-into-base

    @RahulGautamSingh
    RahulGautamSingh committed Apr 27, 2023
    Copy the full SHA
    8afdeb4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feat/merge-onboarding-into-base

    @RahulGautamSingh
    RahulGautamSingh committed Apr 27, 2023
    Copy the full SHA
    deab039 View commit details
    Browse the repository at this point in the history

  3. fix typo

    @RahulGautamSingh
    RahulGautamSingh committed Apr 27, 2023
    Copy the full SHA
    0114fa5 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into feat/merge-onboarding-into-base

    @RahulGautamSingh
    RahulGautamSingh committed Apr 27, 2023
    Copy the full SHA
    bd84238 View commit details
    Browse the repository at this point in the history

  5. refactor

    @RahulGautamSingh
    RahulGautamSingh committed Apr 27, 2023
    Copy the full SHA
    01f01d0 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2023

  1. Merge branch 'main' into feat/merge-onboarding-into-base

    @RahulGautamSingh
    RahulGautamSingh committed May 3, 2023
    Copy the full SHA
    90af567 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2023

  1. Merge branch 'main' into feat/merge-onboarding-into-base

    @RahulGautamSingh
    RahulGautamSingh committed May 13, 2023
    Copy the full SHA
    46b0454 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2023

  1. fix tests

    @RahulGautamSingh
    RahulGautamSingh committed May 14, 2023
    Copy the full SHA
    478dc60 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feat/merge-onboarding-into-base

    @RahulGautamSingh
    RahulGautamSingh committed May 14, 2023
    Copy the full SHA
    8334f38 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2023

  1. Apply suggestions from code review 

    Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
    @RahulGautamSingh @viceice
    RahulGautamSingh and viceice committed May 16, 2023
    Copy the full SHA
    028f4e1 View commit details
    Browse the repository at this point in the history

  2. fix formatting

    @RahulGautamSingh
    RahulGautamSingh committed May 16, 2023
    Copy the full SHA
    22634b0 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into feat/merge-onboarding-into-base

    @RahulGautamSingh
    RahulGautamSingh committed May 16, 2023
    Copy the full SHA
    f0c00bd View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into feat/merge-onboarding-into-base

    @RahulGautamSingh
    RahulGautamSingh committed May 16, 2023
    Copy the full SHA
    9233910 View commit details
    Browse the repository at this point in the history

  5. Update lib/workers/repository/onboarding/branch/check.ts 

    Co-authored-by: Rhys Arkins <rhys@arkins.net>
    @RahulGautamSingh @rarkins
    RahulGautamSingh and rarkins committed May 16, 2023
    Copy the full SHA
    c57c02f View commit details
    Browse the repository at this point in the history

  6. Update lib/workers/repository/onboarding/branch/index.ts 

    Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
    @RahulGautamSingh @viceice
    RahulGautamSingh and viceice committed May 16, 2023
    Copy the full SHA
    8004e47 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2023

  1. rename for clarity

    @rarkins
    rarkins committed May 18, 2023
    Copy the full SHA
    a4b3b82 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feat/merge-onboarding-into-base

    @rarkins
    rarkins committed May 18, 2023
    Copy the full SHA
    a957979 View commit details
    Browse the repository at this point in the history