From d09a8aaf4c8b88edbadde9d3d7103f10fabae19b Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 4 Dec 2024 10:33:06 +1100 Subject: [PATCH] chore: replace 'clearnet' with 'unstable' --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/workflows/build-binaries.yml | 2 -- CONTRIBUTING.md | 4 ++-- THEMES.md | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 2e219d735..d957f6f4d 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -14,7 +14,7 @@ Remember, you can preview this before saving it. ### Contributor checklist: - [ ] My commits are in nice logical chunks with [good commit messages](http://chris.beams.io/posts/git-commit/) -- [ ] My changes are [rebased](https://blog.axosoft.com/golden-rule-of-rebasing-in-git/) on the latest [`clearnet`](https://github.com/oxen-io/session-desktop/tree/clearnet) branch +- [ ] My changes are [rebased](https://blog.axosoft.com/golden-rule-of-rebasing-in-git/) on the latest [`unstable`](https://github.com/oxen-io/session-desktop/tree/unstable) branch - [ ] A `yarn ready` run passes successfully ([more about tests here](https://github.com/oxen-io/session-desktop/blob/master/CONTRIBUTING.md#tests)) - [ ] My changes are ready to be shipped to users diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml index 0f7b35dab..020b37bf0 100644 --- a/.github/workflows/build-binaries.yml +++ b/.github/workflows/build-binaries.yml @@ -8,13 +8,11 @@ on: push: branches: - master - - clearnet - unstable - 'release/**' - 'ci/**' pull_request: branches: - - clearnet - unstable - 'release/**' - 'ci/**' diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fc2c48049..c4891a3b8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -239,10 +239,10 @@ So you wanna make a pull request? Please observe the following guidelines. - Please do not submit pull requests for pure translation fixes. Anyone can update the translations at [Crowdin](https://getsession.org/translate). - [Rebase](https://nathanleclaire.com/blog/2014/09/14/dont-be-scared-of-git-rebase/) your - changes on the latest `clearnet` branch, resolving any conflicts. + changes on the latest `unstable` branch, resolving any conflicts. This ensures that your changes will merge cleanly when you open your PR. - Be sure to add and run tests! -- Make sure the diff between `clearnet` and your branch contains only the +- Make sure the diff between `unstable` and your branch contains only the minimal set of changes needed to implement your feature or bugfix. This will make it easier for the person reviewing your code to approve the changes. Please do not submit a PR with commented out code or unfinished features. diff --git a/THEMES.md b/THEMES.md index 37a98dfc2..86e82a95c 100644 --- a/THEMES.md +++ b/THEMES.md @@ -23,7 +23,7 @@ Session doesn't support custom theming yet but it's pretty easy to add a new the [Here](https://github.com/yougotwill/session-desktop/pull/19) is an example PR for the `Windows Crash` theme which was inspired by the classic [blue screen of death](https://user-images.githubusercontent.com/14887287/203880658-e4a768d7-1b25-45d2-9e6d-00b233eb84a8.png). -Keep in mind that if you swap back to the latest `clearnet` with the `Windows Crash` theme set it may cause a database issue. So when you change your branch back make sure to set your theme to one of the [available themes](#available-themes) above. +Keep in mind that if you swap back to the latest `unstable` with the `Windows Crash` theme set it may cause a database issue. So when you change your branch back make sure to set your theme to one of the [available themes](#available-themes) above. ### Screenshot