treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
Treehouse Mastodon git tree
18,230 Commits
12 Branches
15 Tags
760 MiB
Ruby 48.7%
JavaScript 33.9%
SCSS 7.9%
TypeScript 5.6%
Haml 3.5%
Other 0.4%
 
 
 
 
 
 
Go to file
Claire c51e8de4ad Merge commit 'bc7e7185ac0f0c10ebf354b738b8dfb4e8e43dcb' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream fixed a translation bug in the theme selector that is absent from
  glitch-soc due to our different theming system.
  Discarded upstream changes.
- `streaming/index.js`:
  Upstream changed the signature of a function to change its return type.
  This is not a real conflict, the conflict being caused by an extra
  argument in glitch-soc's code.
  Applied upstream's change while keeping our extra argument.
 		2023-06-10 17:18:36 +02:00
.devcontainer fix: remove port 80 mapping in devcontainer (#24658) 2023-04-30 17:03:28 +09:00
.github Merge commit '68d362c0fc4d41cc97e981640bef41dea6f9f79d' into glitch-soc/merge-upstream 2023-06-10 16:48:01 +02:00
.husky Use Yarn instead of NPX for pre-commit hook (#24287) 2023-03-28 06:28:57 +02:00
app Merge commit 'bc7e7185ac0f0c10ebf354b738b8dfb4e8e43dcb' into glitch-soc/merge-upstream 2023-06-10 17:18:36 +02:00
bin Move the mastodon/*_cli files to mastodon/cli/* (#24139) 2023-05-23 16:08:26 +02:00
chart helm: cleanup helm chart, now in mastodon/chart (#21801) 2022-12-09 06:36:29 +01:00
config Merge commit '68d362c0fc4d41cc97e981640bef41dea6f9f79d' into glitch-soc/merge-upstream 2023-06-10 16:48:01 +02:00
db Merge commit '68d362c0fc4d41cc97e981640bef41dea6f9f79d' into glitch-soc/merge-upstream 2023-06-10 16:48:01 +02:00
dist Remove clustering from streaming API (#24655) 2023-04-26 11:37:51 +02:00
lib Merge commit '68d362c0fc4d41cc97e981640bef41dea6f9f79d' into glitch-soc/merge-upstream 2023-06-10 16:48:01 +02:00
log
…
public Merge branch 'main' into glitch-soc/merge-upstream 2023-01-05 14:16:25 +01:00
spec Merge commit 'bc7e7185ac0f0c10ebf354b738b8dfb4e8e43dcb' into glitch-soc/merge-upstream 2023-06-10 17:18:36 +02:00
streaming Merge commit 'bc7e7185ac0f0c10ebf354b738b8dfb4e8e43dcb' into glitch-soc/merge-upstream 2023-06-10 17:18:36 +02:00
vendor
…
.browserslistrc Add ES6 compatibility to browserslist (#18519) 2022-05-26 20:29:28 +02:00
.buildpacks Remove nodejs buildpack from buildpacks (#14364) 2020-07-20 09:48:10 +02:00
.bundler-audit.yml Run bundler-audit on PRs (#23514) 2023-02-18 12:49:09 +01:00
.dockerignore Update .dockerignore/.gitignore for #16947 etc (#17099) 2021-12-06 18:04:04 +01:00
.editorconfig Enable EditorConfig trailing whitespace trimming (#23543) 2023-02-12 08:34:17 +01:00
.env.production.sample Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
.env.test
…
.env.vagrant Add a default DB_HOST to .env.vagrant for enable the streaming (#14030) 2020-06-15 01:57:06 +02:00
.eslintignore
…
.eslintrc.js Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream 2023-06-10 16:22:14 +02:00
.foreman
…
.gitattributes
…
.gitignore helm: cleanup helm chart, now in mastodon/chart (#21801) 2022-12-09 06:36:29 +01:00
.gitmodules
…
.haml-lint.yml Consistently use middle dot (·) instead of bullet (•) to separate items (#25248) 2023-06-02 19:58:18 +02:00
.haml-lint_todo.yml Fix more haml-lint Rubocop (#24107) 2023-03-15 20:07:43 +01:00
.nanoignore
…
.nvmrc Update Node.js to 16.20.0 (#24316) 2023-04-07 14:26:11 +02:00
.prettierignore Merge commit '29851c83bd518f7fe8ba44cf0c550c57047ddfa4' into glitch-soc/merge-upstream 2023-06-10 15:32:29 +02:00
.prettierrc.js Use Prettier for ESLint formatting TypeScript (#23631) 2023-05-09 19:02:12 +02:00
.profile Make it possible to upload audio and video to Heroku app (#24866) 2023-05-05 14:41:07 +02:00
.rspec
…
.rubocop.yml Consistently use middle dot (·) instead of bullet (•) to separate items (#25248) 2023-06-02 19:58:18 +02:00
.rubocop_todo.yml Merge commit '68d362c0fc4d41cc97e981640bef41dea6f9f79d' into glitch-soc/merge-upstream 2023-06-10 16:48:01 +02:00
.ruby-gemset Make Mastodon use its own gemset (#17858) 2022-08-13 15:44:34 +02:00
.ruby-version Bump ruby to 3.2.2 due to ReDoS vulnerabilities (#24320) 2023-03-31 18:28:40 +02:00
.slugignore
…
.yarnclean Setup Husky and lint-stage for commit fixing (#23308) 2023-03-27 05:17:19 +02:00
AUTHORS.md Update AUTHORS.md (#20630) 2022-11-14 08:33:24 +01:00
Aptfile Make it possible to upload audio and video to Heroku app (#24866) 2023-05-05 14:41:07 +02:00
CHANGELOG.md Bump version to v4.1.2 (#24427) 2023-04-07 09:01:57 +02:00
CODE_OF_CONDUCT.md Update Contributor Covenant to 2.1 (#23980) 2023-04-23 23:11:50 +02:00
CONTRIBUTING.md Fix glitch-soc Markdown linting issues (#2168) 2023-04-08 17:23:24 +02:00
Capfile Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
Dockerfile Fix minor typos in comments and spec names (#21831) 2023-05-19 17:13:29 +02:00
FEDERATION.md Add FEDERATION.md (#17029) 2021-11-23 00:15:31 +01:00
Gemfile Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream 2023-06-10 16:22:14 +02:00
Gemfile.lock Add Ruby & Bundler versions to Gemfile.lock (#25317) 2023-06-09 16:34:36 +02:00
LICENSE
…
Procfile fix: make Procfile compatible with herokuish (#12685) 2020-08-29 19:00:30 +02:00
Procfile.dev Set RAILS_ENV in Procfile.dev (#15502) 2021-01-07 09:30:12 +01:00
README.md Fix glitch-soc Markdown linting issues (#2168) 2023-04-08 17:23:24 +02:00
Rakefile
…
SECURITY.md Fix Markdown files with Prettier and check in CI (#21972) 2023-02-20 07:37:28 +01:00
Vagrantfile Merge branch 'main' into glitch-soc/merge-upstream 2022-12-07 09:03:42 +01:00
app.json Make enable_starttls configurable by envvars (#20321) 2022-11-10 21:06:21 +01:00
babel.config.js Upgrade react-intl (#24906) 2023-05-31 23:43:39 +02:00
config.ru Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
crowdin-glitch.yml Add crowdin configuration file (#2030) 2022-12-21 22:13:22 +01:00
crowdin.yml Remove empty HTTP error translations (#24210) 2023-04-30 17:04:15 +09:00
docker-compose.yml Use Github Container Registry as the official container image source (#24113) 2023-03-15 16:41:13 +01:00
ide-helper.js
…
jest.config.js Merge commit '29851c83bd518f7fe8ba44cf0c550c57047ddfa4' into glitch-soc/merge-upstream 2023-06-10 15:32:29 +02:00
jsconfig.json Correct prettier calls for YML/JSON (#21832) 2022-12-03 12:05:35 +09:00
package.json Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream 2023-06-10 16:22:14 +02:00
postcss.config.js Update PostCSS dependencies (#23835) 2023-03-15 04:01:10 +01:00
priv-config
…
scalingo.json Add S3 region list reference to Scalingo config (#24152) 2023-04-26 16:46:19 +02:00
stylelint.config.js Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
tsconfig.json Merge commit '3b0c3e94e0831edcf4298bf9940799a2e94c5583' into glitch-soc/merge-upstream 2023-05-28 13:55:30 +02:00
yarn.lock Merge commit '68d362c0fc4d41cc97e981640bef41dea6f9f79d' into glitch-soc/merge-upstream 2023-06-10 16:48:01 +02:00

README.md

Mastodon Glitch Edition

Now with automated deploys!

Build Status Code Climate

So here's the deal: we all work on this code, and anyone who uses that does so absolutely at their own risk. can you dig it?