From 8721f0b3c76f8eb830eded985a79c3e8bf8ca3ad Mon Sep 17 00:00:00 2001 From: Syed Muhammad Dawoud Sheraz Ali Date: Tue, 19 Nov 2024 18:04:45 +0500 Subject: [PATCH] feat!: Rename branches master->release, nightly->main --- .github/workflows/sync.yml | 2 +- .github/workflows/test.yml | 4 +++- README.rst | 6 +++--- changelog.d/20241119_180254_dawoud.sheraz_branch_rename.md | 3 +++ 4 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 changelog.d/20241119_180254_dawoud.sheraz_branch_rename.md diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index ec2f9b9..76c6724 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -2,7 +2,7 @@ name: Sync with private repo on: push: - branches: [ master, main, nightly ] + branches: [ release, main ] jobs: sync: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 543550a..971411b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,7 +2,9 @@ name: Run tests on: pull_request: - branches: [master] + branches: [ release, main ] + push: + branches: [ release, main ] jobs: tests: diff --git a/README.rst b/README.rst index b6fd30b..af3b9f7 100644 --- a/README.rst +++ b/README.rst @@ -73,11 +73,11 @@ To add the default dashboards to the new user, add the ``--bootstrap-dashboards` Some event data might be missing from your dashboards: just start using your LMS and refresh your dashboard. The new events should appear immediately. -.. image:: https://raw.githubusercontent.com/overhangio/tutor-cairn/master/screenshots/courseoverview-01.png +.. image:: https://raw.githubusercontent.com/overhangio/tutor-cairn/release/screenshots/courseoverview-01.png :alt: Course overview dashboard part 1 -.. image:: https://raw.githubusercontent.com/overhangio/tutor-cairn/master/screenshots/courseoverview-02.png +.. image:: https://raw.githubusercontent.com/overhangio/tutor-cairn/release/screenshots/courseoverview-02.png :alt: Course overview dashboard part 2 -.. image:: https://raw.githubusercontent.com/overhangio/tutor-cairn/master/screenshots/courseoverview-03.png +.. image:: https://raw.githubusercontent.com/overhangio/tutor-cairn/release/screenshots/courseoverview-03.png :alt: Course overview dashboard part 3 By default, ``AUTH_ROLES_SYNC_AT_LOGIN`` is ``false`` which means admin can customize the permissions associated to a user. To disable this behaviour, modify the ``CAIRN_AUTH_ROLES_SYNC_AT_LOGIN`` setting:: diff --git a/changelog.d/20241119_180254_dawoud.sheraz_branch_rename.md b/changelog.d/20241119_180254_dawoud.sheraz_branch_rename.md new file mode 100644 index 0000000..0385bc2 --- /dev/null +++ b/changelog.d/20241119_180254_dawoud.sheraz_branch_rename.md @@ -0,0 +1,3 @@ +- 💥[Improvement] Rename Tutor's two branches (by @DawoudSheraz): + * Rename **master** to **release**, as this branch runs the latest official Open edX release tag. + * Rename **nightly** to **main**, as this branch runs the Open edX master branches, which are the basis for the next Open edX release.