diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-01-05 14:16:25 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-01-05 14:16:25 +0100 |
| commit | 6c20dad201efdfaec59c37ce3f3ca4c7702b5274 (patch) | |
| tree | b1df234db04b93b7d0c241d120019f03368850f4 /.devcontainer/devcontainer.json | |
| parent | 7e9d5bdbb9125197afb5b3df69ce49a79451d697 (diff) | |
| parent | 18d00055f4f7e28a9a4cc81d3159072e9beb779d (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Upstream updated its README, while we have a completely different one. Kept our README. - `app/controllers/concerns/web_app_controller_concern.rb`: Conflict because of glitch-soc's theming system. Additionally, glitch-soc has different behavior regarding moved accounts. Ported some of the changes, but kept our overall behavior. - `app/javascript/packs/admin.js`: Code changes actually applied to `app/javascript/core/admin.js`
Diffstat (limited to '.devcontainer/devcontainer.json')
| -rw-r--r-- | .devcontainer/devcontainer.json | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 01941a9d3..b98f6a21e 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -15,6 +15,12 @@ "webben.browserslist" ], + "features": { + "ghcr.io/devcontainers/features/sshd:1": { + "version": "latest" + } + }, + // Use 'forwardPorts' to make a list of ports inside the container available locally. // This can be used to network with other containers or the host. "forwardPorts": [3000, 4000], |