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 dev to main #798

Merged
merged 11 commits into from
Jun 17, 2024
Merged

Merge dev to main #798

merged 11 commits into from
Jun 17, 2024

Commits on May 29, 2024

  1. Update Workbench tests for >=2024.7 preview compatibility

    @ianpittwood
    ianpittwood committed May 29, 2024
    Configuration menu
    Copy the full SHA
    892d78e View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. Update r-session-complete tests for >=2024.7 preview compatibility

    @ianpittwood
    ianpittwood committed May 30, 2024
    Configuration menu
    Copy the full SHA
    10d4acc View commit details
    Browse the repository at this point in the history

  2. Merge pull request #784 from rstudio/update-workbench-2024.7-tests 

    Update Workbench tests for >=2024.7 preview compatibility
    @ianpittwood
    ianpittwood committed May 30, 2024
    Configuration menu
    Copy the full SHA
    c635200 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. Bump PPM to 2024.04.2 

    Update R to version 4.4.0
    @tylfin
    tylfin committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    1df874a View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. Merge pull request #787 from rstudio/ppm-2024.04.2 

    Bump PPM to 2024.04.2
    @ianpittwood
    ianpittwood committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    b1412e4 View commit details
    Browse the repository at this point in the history

  2. Revert "Bump PPM to 2024.04.2"

    @ianpittwood
    ianpittwood committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    3ada4d2 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #793 from rstudio/revert-787-ppm-2024.04.2 

    Revert "Bump PPM to 2024.04.2"
    @ianpittwood
    ianpittwood committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    92effb6 View commit details
    Browse the repository at this point in the history

  4. bump pwb to 2024.04.2+764.pro1

    @gtritchie
    gtritchie committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    f0644af View commit details
    Browse the repository at this point in the history

  5. Merge pull request #794 from rstudio/bump-pwb-2024.04.2 

    bump pwb to 2024.04.2+764.pro1
    @gtritchie
    gtritchie committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    b294e42 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2024

  1. Reapply "Bump PPM to 2024.04.2" (#795) 

    * Reapply "Bump PPM to 2024.04.2"

This reverts commit 3ada4d2.

* Bump to patch 26

* Bump to patch 27

* Bump to patch 29

* Update Justfile

Co-authored-by: Michael Thomson <[email protected]>

---------

Co-authored-by: Michael Thomson <[email protected]>
    @tylfin @fh-mthomson
    tylfin and fh-mthomson committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    9a017cf View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. Merge branch 'main' into dev

    @ianpittwood
    ianpittwood committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    3718640 View commit details
    Browse the repository at this point in the history