Skip to content

Commit

Permalink
update all references to wagtail-torchbox repo to the new one
Browse files Browse the repository at this point in the history
  • Loading branch information
helenb committed Dec 21, 2023
1 parent 51fee3e commit ecc1179
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Torchbox.com on Wagtail

[![CI](https://github.com/torchbox/wagtail-torchbox/actions/workflows/test.yml/badge.svg)](https://github.com/torchbox/wagtail-torchbox/actions/workflows/test.yml)
[![CI](https://github.com/torchbox/torchbox.com/actions/workflows/test.yml/badge.svg)](https://github.com/torchbox/torchbox.com/actions/workflows/test.yml)

This is the main Torchbox.com website. The careers section of this site can be found at [torchbox/careers](https://github.com/torchbox/careers).

Expand Down Expand Up @@ -67,8 +67,8 @@ If you are using Docker Desktop, ensure the Resources:File Sharing settings allo
Starting a local build can be done by running:

```bash
git clone [email protected]:torchbox/wagtail-torchbox.git
cd wagtail-torchbox
git clone [email protected]:torchbox/torchbox.com.git
cd torchbox.com
fab build
fab migrate
fab start
Expand Down
2 changes: 1 addition & 1 deletion docs/continuous-integration.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ $ detect-secrets scan > .secrets.baseline

## Automatic checks on Github

When commits are pushed to Github, CI pipelines including tests, and linting checks are run. This is configured here: https://github.com/torchbox/wagtail-torchbox/blob/master/.github/workflows/test.yml
When commits are pushed to Github, CI pipelines including tests, and linting checks are run. This is configured here: https://github.com/torchbox/torchbox.com/blob/master/.github/workflows/test.yml
6 changes: 3 additions & 3 deletions docs/infrastructure.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ Steps for resetting the `staging` git branch, and deploying it with a clone of t

### Database

This site uses flightpath[^2] to manage staging reset. This is implemented as [Copy prod to staging](https://github.com/torchbox/wagtail-torchbox/actions/workflows/flightpath.yml) Github Actions.
This site uses flightpath[^2] to manage staging reset. This is implemented as [Copy prod to staging](https://github.com/torchbox/torchbox.com/actions/workflows/flightpath.yml) Github Actions.

To run, go the [Github Actions page](https://github.com/torchbox/wagtail-torchbox/actions/workflows/flightpath.yml), click on 'Run workflow', and select `master`.
To run, go the [Github Actions page](https://github.com/torchbox/torchbox.com/actions/workflows/flightpath.yml), click on 'Run workflow', and select `master`.

### Media

Expand All @@ -119,4 +119,4 @@ This will be copied by flightpath.
<!-- Footnotes -->

[^1]: The client in this case is Torchbox!
[^2]: See [`tbx/core/utils/scripts/run_flightpath.py`](https://github.com/torchbox/wagtail-torchbox/blob/bfccccca76c389a2f539419e745e7ac5f191ce4c/tbx/core/utils/scripts/run_flightpath.py)
[^2]: See [`tbx/core/utils/scripts/run_flightpath.py`](https://github.com/torchbox/torchbox.com/blob/bfccccca76c389a2f539419e745e7ac5f191ce4c/tbx/core/utils/scripts/run_flightpath.py)
2 changes: 1 addition & 1 deletion docs/project-conventions.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ We follow a loose version of the [Git flow branching model](https://nvie.com/pos

1. Make changes on a new branch, including a broad category and the ticket number if relevant e.g. `feature/123-extra-squiggles`, `fix/newsletter-signup`.
2. Push your branch to the remote.
3. Make pull requests at https://github.com/torchbox/wagtail-torchbox/pulls
3. Make pull requests at https://github.com/torchbox/torchbox.com/pulls
4. Edit details as necessary.

If you need to preview work on `staging`, this can be merged and deployed manually without making a pull request. You can still make the pull request as above, but add a note to say that this is on `staging`, and not yet ready to be merged to `master`.
Expand Down
2 changes: 1 addition & 1 deletion mkdocs.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
site_name: Torchbox
repo_url: https://github.com/torchbox/wagtail-torchbox
repo_url: https://github.com/torchbox/torchbox.com
site_url:
edit_uri: 'edit/master/docs/'

Expand Down
2 changes: 1 addition & 1 deletion tbx/static_src/javascript/components/console-message.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit ecc1179

Please sign in to comment.