treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

th: merge instructions? maybe
ci/woodpecker/push/woodpecker Pipeline was successful Details

lolsob-rspec
kouhai dev 2023-10-22 16:29:05 -07:00
parent 276954bfd0
commit 6f669d0fd2
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CONTRIBUTING.md
View File

@ -6,6 +6,24 @@ Here are some guidelines, and ways you can help.
> (This document is a bit of a work-in-progress, so please bear with us. > (This document is a bit of a work-in-progress, so please bear with us.
> If you don't see what you're looking for here, please don't hesitate to reach out!) > If you don't see what you're looking for here, please don't hesitate to reach out!)
## Merging
If your username is kouhai, or you're otherwise merging from upstream glitch-soc
for some reason, the following snippets may be useful:
```sh
git fetch glitch && git merge glitch/main && git checkout glitch/main -- yarn.lock
```
```sh
export RAILS_ENV=production NODE_ENV=production
export OTP_SECRET=precompile_placeholder SECRET_KEY_BASE=precompile_placeholder
bundle install \
&& yarn install \
&& bundle exec rake assets:clobber \
&& bundle exec rake webpacker:compile | tee /tmp/out.log
```
## Translations ## Translations
You can submit glitch-soc-specific translations via [Crowdin](https://crowdin.com/project/glitch-soc). They are periodically merged into the codebase. You can submit glitch-soc-specific translations via [Crowdin](https://crowdin.com/project/glitch-soc). They are periodically merged into the codebase.

3
Procfile.dev
View File

@ -1,4 +1,5 @@
web: env PORT=3000 RAILS_ENV=development bundle exec puma -C config/puma.rb web: env PORT=3000 RAILS_ENV=development bundle exec puma -C config/puma.rb
sidekiq: env PORT=3000 RAILS_ENV=development bundle exec sidekiq sidekiq: env PORT=3000 RAILS_ENV=development bundle exec sidekiq
stream: env PORT=4000 yarn run start stream: env PORT=4000 yarn run start
webpack: bin/webpack-dev-server webpack: env RAILS_ENV=development NODE_ENV=development NODE_OPTIONS=--openssl-legacy-provider ./bin/webpack-dev-server --listen-host 0.0.0.0
caddy: caddy run