Update from `main` (production)

appsembler / edx-platform

Appsembler Tahoe fork of Open edX. Branches: `main` for Juniper and `hawthorn/main` for Hawthorn.

https://appsembler.com/products/tahoe/

GNU Affero General Public License v3.0

13 stars 15 forks source link

Update from `main` (production) #1337

Closed github-actions[bot] closed 1 year ago

github-actions[bot] commented 1 year ago

This is an automated pull request to update from branch main

github-actions[bot] commented 1 year ago

Checking git merge conflicts against https://github.com/edx/edx-platform.git

Comparing with	`open-release/nutmeg.master`
Benchmark conflicts with `prod`	292
Current conflicts	293
Summary	Adds 1 new conflicts. How can we do better?

New conflicting files with 'open-release/nutmeg.master'

``` openedx/core/djangoapps/user_authn/cookies.py ```

Comparing with	`master`
Benchmark conflicts with `prod`	300
Current conflicts	301
Summary	Adds 1 new conflicts. How can we do better?

New conflicting files with 'master'

``` openedx/core/djangoapps/user_authn/cookies.py ```

github-actions[bot] commented 1 year ago

Checking git merge conflicts against https://github.com/edx/edx-platform.git

Comparing with	`open-release/nutmeg.master`
Benchmark conflicts with `prod`	292
Current conflicts	296
Summary	Adds 4 new conflicts. How can we do better?

New conflicting files with 'open-release/nutmeg.master'

``` openedx/core/djangoapps/user_authn/cookies.py openedx/core/djangoapps/user_authn/views/logout.py openedx/core/djangoapps/user_authn/views/tests/test_logout.py ```

Comparing with	`master`
Benchmark conflicts with `prod`	300
Current conflicts	304
Summary	Adds 4 new conflicts. How can we do better?

New conflicting files with 'master'

``` openedx/core/djangoapps/user_authn/cookies.py openedx/core/djangoapps/user_authn/views/logout.py openedx/core/djangoapps/user_authn/views/tests/test_logout.py ```

github-actions[bot] commented 1 year ago

Checking git merge conflicts against https://github.com/edx/edx-platform.git

Comparing with	`open-release/nutmeg.master`
Benchmark conflicts with `prod`	292
Current conflicts	296
Summary	Adds 4 new conflicts. How can we do better?

New conflicting files with 'open-release/nutmeg.master'

``` openedx/core/djangoapps/user_authn/cookies.py openedx/core/djangoapps/user_authn/views/logout.py openedx/core/djangoapps/user_authn/views/tests/test_logout.py ```

Comparing with	`master`
Benchmark conflicts with `prod`	300
Current conflicts	304
Summary	Adds 4 new conflicts. How can we do better?

New conflicting files with 'master'

``` openedx/core/djangoapps/user_authn/cookies.py openedx/core/djangoapps/user_authn/views/logout.py openedx/core/djangoapps/user_authn/views/tests/test_logout.py ```