diff options
| author | Lain Soykaf <lain@lain.com> | 2022-12-15 17:17:49 -0500 |
|---|---|---|
| committer | Lain Soykaf <lain@lain.com> | 2022-12-15 17:19:36 -0500 |
| commit | 63d00f8123ddc5a8d9917e48216775f98ceac713 (patch) | |
| tree | d65a76433291d1383f56bb8d55ce6eb29d69cfd6 /docs/administration | |
| parent | 2186e9b62b9c88812a616a7ad0d80f4b10a2deb1 (diff) | |
| parent | 204fd6faae8c39706a5ded42c7cc4fbc71a733bc (diff) | |
| download | pleroma-63d00f8123ddc5a8d9917e48216775f98ceac713.tar.gz pleroma-63d00f8123ddc5a8d9917e48216775f98ceac713.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-deps
Diffstat (limited to 'docs/administration')
| -rw-r--r-- | docs/administration/CLI_tasks/frontend.md | 2 | ||||
| -rw-r--r-- | docs/administration/updating.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/administration/CLI_tasks/frontend.md b/docs/administration/CLI_tasks/frontend.md index d4a48cb56..4e9d9eecb 100644 --- a/docs/administration/CLI_tasks/frontend.md +++ b/docs/administration/CLI_tasks/frontend.md @@ -22,7 +22,7 @@ Currently, known `<frontend>` values are: - [kenoma](http://git.pleroma.social/lambadalambda/kenoma) - [pleroma-fe](http://git.pleroma.social/pleroma/pleroma-fe) - [fedi-fe](https://git.pleroma.social/pleroma/fedi-fe) -- [soapbox-fe](https://gitlab.com/soapbox-pub/soapbox-fe) +- [soapbox](https://gitlab.com/soapbox-pub/soapbox) You can still install frontends that are not configured, see below. diff --git a/docs/administration/updating.md b/docs/administration/updating.md index 01d3b9b0e..00eca36a0 100644 --- a/docs/administration/updating.md +++ b/docs/administration/updating.md @@ -17,7 +17,7 @@ su pleroma -s $SHELL -lc "./bin/pleroma_ctl migrate" ## For from source installations (using git) 1. Go to the working directory of Pleroma (default is `/opt/pleroma`) -2. Run `git pull` [^1]. This pulls the latest changes from upstream. +2. Run `git checkout <tagged release>` [^1]. e.g. `git checkout v2.4.5` This pulls the [tagged release](https://git.pleroma.social/pleroma/pleroma/-/releases) from upstream. 3. Run `mix deps.get` [^1]. This pulls in any new dependencies. 4. Stop the Pleroma service. 5. Run `mix ecto.migrate` [^1] [^2]. This task performs database migrations, if there were any. |