forked from zinc-collective/convene
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'zinc-collective:main' into main
- Loading branch information
Showing
55 changed files
with
860 additions
and
500 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
3.2.3 | ||
3.3.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -66,8 +66,11 @@ First, ensure your development environment has: | |
1. Ruby (See [.ruby-version](./.ruby-version) for version) | ||
2. Node (See [.nvmrc](./.nvmrc) for version) | ||
3. [Yarn] | ||
4. [PostgreSQL]. (Note: For people using [Docker], a [docker-compose.yml] | ||
file has been included for convenience.) | ||
4. [PostgreSQL] | ||
5. [Redis] | ||
|
||
(Note: If you use [Docker], a [docker-compose.yml] file has been included with | ||
[PostgreSQL] and [Redis] for convenience.) | ||
|
||
Then, run `bin/setup` to install Ruby and Node dependencies and set up the | ||
database. | ||
|
@@ -83,7 +86,8 @@ Log in with [email protected]. You can check the email using http://local | |
Finally, with the server still running (perhaps in a different terminal), run | ||
`bin/test` to ensure that your development environment is configured correctly. | ||
|
||
[PostgreSQL 12]: https://www.postgresql.org/download/ | ||
[PostgreSQL]: https://www.postgresql.org/ | ||
[Redis]: https://redis.io/ | ||
[Docker]: https://www.docker.com | ||
[docker-compose.yml]: ./docker-compose.yml | ||
[.env.development.example]: ./.env.development.example | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.