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 3.6.x into main #12996

Closed
wants to merge 24 commits into from
Closed

Merge 3.6.x into main #12996

wants to merge 24 commits into from

Commits on Jul 12, 2023

  1. Remove Snyk jobs from CI scanning

    @rasa-jmac
    rasa-jmac committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    0d58385 View commit details
    Browse the repository at this point in the history

  2. Fix line formatting

    @rasa-jmac
    rasa-jmac committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    dc6f00d View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2023

  1. Made use of drop-small-last-batch logic only possible in DIET and con… 

    …figurable (#12948)

* Made use of drop-small-last-batch logic only possible in DIET and configurable
    @twerkmeister
    twerkmeister authored Nov 16, 2023
    Configuration menu
    Copy the full SHA
    58e122f View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2023

  1. adjusted release script to work with public remote (#12953)

    @twerkmeister
    twerkmeister authored Nov 17, 2023
    Configuration menu
    Copy the full SHA
    048dc80 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2023

  1. Prepare release 3.6.14 (#12956) 

    * prepared release of version 3.6.14
    @twerkmeister
    twerkmeister authored Nov 20, 2023
    Configuration menu
    Copy the full SHA
    241bf28 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2023

  1. Port "connection timeout to action server" changes to 3.6.x - [ENG 68… 

    …9] (#12965)

* Merge pull request #106 from RasaHQ/ENG-680-DEFAULT_KEEP_ALIVE_TIMEOUT

Fix connection to action server - [ENG 680]

---------

Co-authored-by: Tom Bocklisch <tom@rasa.com>
    @varunshankar @tmbo
    varunshankar and tmbo authored Nov 30, 2023
    Configuration menu
    Copy the full SHA
    609287e View commit details
    Browse the repository at this point in the history

  2. prepared release of version 3.6.15 (#12967) 

    * prepared release of version 3.6.15
    @varunshankar
    varunshankar authored Nov 30, 2023
    Configuration menu
    Copy the full SHA
    7cfc7d0 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. Merge branch '3.6.x' into security/remove_snyk_ci_scans

    @rasa-jmac
    rasa-jmac authored Dec 11, 2023
    Configuration menu
    Copy the full SHA
    5d037b9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #12667 from RasaHQ/security/remove_snyk_ci_scans 

    Remove Snyk CI Scans
    @rasa-jmac
    rasa-jmac authored Dec 11, 2023
    Configuration menu
    Copy the full SHA
    ff52994 View commit details
    Browse the repository at this point in the history

  3. Additional load testing recommendations

    @sanchariGr
    sanchariGr committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    865902f View commit details
    Browse the repository at this point in the history

  4. Merge branch '3.6.x' into ATO-1628

    @sanchariGr
    sanchariGr authored Dec 11, 2023
    Configuration menu
    Copy the full SHA
    e7a38d9 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2023

  1. [ENG-712] Fix dependency install failures on windows (#150) 

    * prevent race condition in poetry build

* update makefile
    @tabergma
    tabergma authored Dec 21, 2023
    Configuration menu
    Copy the full SHA
    ecdd8be View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2023

  1. update cryptography

    @Tawakalt
    Tawakalt committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    96eead7 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2024

  1. add changelog

    @Tawakalt
    Tawakalt committed Jan 2, 2024
    Configuration menu
    Copy the full SHA
    45cbefd View commit details
    Browse the repository at this point in the history

  2. Merge branch '3.6.x' into ATO-1959-patch-security-vulnerability-3.6.x

    @Tawakalt
    Tawakalt authored Jan 2, 2024
    Configuration menu
    Copy the full SHA
    559aa39 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #12983 from RasaHQ/ATO-1959-patch-security-vulnera… 

    …bility-3.6.x

[ATO-1959] Fix Improper Certificate Validation 3.6.X
    @Tawakalt
    Tawakalt authored Jan 2, 2024
    Configuration menu
    Copy the full SHA
    b1199ca View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2024

  1. Review changes made

    @sanchariGr
    sanchariGr committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    652c175 View commit details
    Browse the repository at this point in the history

  2. Merge branch '3.6.x' into ATO-1628

    @sanchariGr
    sanchariGr authored Jan 4, 2024
    Configuration menu
    Copy the full SHA
    9cafd12 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2024

  1. Add missing CI step condition

    @sanchariGr
    sanchariGr committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    64546fc View commit details
    Browse the repository at this point in the history

  2. Merge pull request #12974 from RasaHQ/ATO-1628 

    Additional load testing recommendations
    @sanchariGr
    sanchariGr authored Jan 5, 2024
    Configuration menu
    Copy the full SHA
    fc72dd8 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2024

  1. update changelog with entries from 3.5.x releases

    @m-vdb
    m-vdb committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    e970b3a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #12995 from RasaHQ/update-changelog-from-3.5 

    update changelog with entries from 3.5.x releases
    @m-vdb
    m-vdb authored Jan 16, 2024
    Configuration menu
    Copy the full SHA
    6019299 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2024

  1. Merge branch 'main' into merge-3.6.x-main-6019299

    @sanchariGr
    sanchariGr authored Jan 17, 2024
    Configuration menu
    Copy the full SHA
    5f451fc View commit details
    Browse the repository at this point in the history

  2. Update sonar github actions

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