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

Enhanced conflict review [extended] #1197

Merged
merged 9 commits into from
Aug 26, 2024
Merged

Enhanced conflict review [extended] #1197

merged 9 commits into from
Aug 26, 2024

Commits on Aug 19, 2024

  1. Address sandbox deployment issue (#1190) 

    * Changes to pass sandbox deployment issues

* Remove explicit install of npm during deploy
    @howard-e
    howard-e authored Aug 19, 2024
    Configuration menu
    Copy the full SHA
    39033e6 View commit details
    Browse the repository at this point in the history

  2. fix: Only match with single alphanumeric keys in "Assign Testers" dro… 

    …pdown search, ignore Tab (#1196)
    @stalgiag
    stalgiag authored Aug 19, 2024
    Configuration menu
    Copy the full SHA
    a80b80b View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2024

  1. * undefined requiredAtVersionName renamed to exactAtVersionName 

    * Re-use versionString instead of relying on testPlanVersion.updatedAt (noticed because it wasn't being passed to the created GH Issue)
    @howard-e
    howard-e committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    e36b5f2 View commit details
    Browse the repository at this point in the history

  2. Create distinction between each conflict

    @howard-e
    howard-e committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    a769b2c View commit details
    Browse the repository at this point in the history

  3. Create unique disclosures

    @howard-e
    howard-e committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    ad3f910 View commit details
    Browse the repository at this point in the history

  4. Correct the conflicts to be unique across assertions

    @howard-e
    howard-e committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    905da06 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'development' into enhanced-conflict-review

    @howard-e
    howard-e committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    2e6faad View commit details
    Browse the repository at this point in the history

  6. Support including conflict markdown from conflicts issue creation

    @howard-e
    howard-e committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    8ee5842 View commit details
    Browse the repository at this point in the history

  7. Update snapshot

    @howard-e
    howard-e committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    2f4660c View commit details
    Browse the repository at this point in the history