tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,669 Commits 10 Branches 0 Tags
aa832d623ac0812a970ea90440c50fca9a7bb616
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Claire aa832d623a Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `CHANGELOG.md`:
  Upstream added newlines.
  Conflicts are because the CHANGELOG was independently merged from 3.4.6 on
  last security update.
  Took upstream's version.
- `app/helpers/context_helper.rb`:
  Conflicts because of extra vocabulary in glitch-soc. The conflicts were
  actually handled in last security merge.
  Kept our version.
2022-02-06 15:34:42 +01:00
.circleci
Add more advanced migration tests (#17393)
2022-01-30 23:50:08 +01:00
.github
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-06 15:34:42 +01:00
app
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-06 15:34:42 +01:00
bin
Update Mastodon to Rails 6.1 (#15910)
2021-03-24 10:44:31 +01:00
chart
Update tootsuite/mastodon Docker tag to v3.4.6 (#17436)
2022-02-03 21:29:20 +01:00
config
Merge branch 'main' into glitch-soc/merge-upstream
2022-01-28 08:58:32 +01:00
db
Merge branch 'main' into glitch-soc/merge-upstream
2022-01-30 22:33:30 +01:00
dist
Add ReadWritePaths directive to service files (#17178)
2021-12-22 04:34:12 +01:00
lib
Forward-port version bump to 3.4.6 (#17434)
2022-02-03 14:21:38 +01:00
log
…
nanobox
Resync Nanobox files with the 2.9.0 release (#11083)
2019-06-14 14:52:31 +02:00
public
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-01 20:59:28 +01:00
spec
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-06 15:34:42 +01:00
streaming
Merge branch 'main' into glitch-soc/merge-upstream
2022-01-07 19:51:47 +01:00
vendor
Increase files checked by ESLint (#9705)
2019-01-04 11:28:38 +01:00
.buildpacks
Remove nodejs buildpack from buildpacks (#14364)
2020-07-20 09:48:10 +02:00
.codeclimate.yml
Exclude locale files from Code Climate (#16863)
2021-10-18 12:04:42 +02:00
.deepsource.toml
Update .deepsource.toml (#15753)
2021-02-19 09:53:25 +01:00
.dockerignore
Update .dockerignore/.gitignore for #16947 etc (#17099)
2021-12-06 18:04:04 +01:00
.editorconfig
…
.env.nanobox
Remove support for OAUTH_REDIRECT_AT_SIGN_IN (#17287)
2022-01-23 15:50:41 +01:00
.env.production.sample
Add optional hCaptcha support
2022-01-24 21:22:13 +01:00
.env.test
Bump webpacker from 4.0.7 to 4.2.0 (#12416)
2019-11-20 17:56:11 +01:00
.env.vagrant
Add a default DB_HOST to .env.vagrant for enable the streaming (#14030)
2020-06-15 01:57:06 +02:00
.eslintignore
Increase files checked by ESLint (#9705)
2019-01-04 11:28:38 +01:00
.eslintrc.js
Enable promise/catch-or-return allowFinally (#14289)
2020-07-11 23:51:22 +02:00
.foreman
…
.gitattributes
…
.gitignore
Update .dockerignore/.gitignore for #16947 etc (#17099)
2021-12-06 18:04:04 +01:00
.gitmodules
…
.haml-lint.yml
…
.nanoignore
…
.nvmrc
NodeJS 14 support - circleci/docker/.nvmrc (#16163)
2021-08-10 22:56:13 +02:00
.profile
…
.rspec
…
.rubocop.yml
Fix rubocop config and warnings (#15503)
2021-01-07 09:40:55 +01:00
.ruby-version
Upgrade Ruby to 3.0.3 (#17038)
2021-11-24 20:29:05 +01:00
.sass-lint.yml
Fix sass-lint config (#10982)
2019-06-06 18:51:46 +02:00
.slugignore
…
.yarnclean
Replace from scss-lint to sass-lint (#10958)
2019-06-04 17:23:18 +02:00
app.json
Change references to tootsuite/mastodon to mastodon/mastodon (#16491)
2021-07-13 15:46:20 +02:00
Aptfile
Use libvpx >= 5 (#15591)
2021-01-22 10:09:40 +01:00
AUTHORS.md
Change references to tootsuite/mastodon to mastodon/mastodon (#16491)
2021-07-13 15:46:20 +02:00
babel.config.js
Remove dependency for @babel/plugin-proposal-class-properties (#16155)
2021-05-04 23:13:04 +02:00
boxfile.yml
Fix to isolate the sidekiq process that runs the scheduler job (#15314)
2020-12-15 03:04:03 +01:00
Capfile
…
CHANGELOG.md
Forward-port version bump to 3.4.6 (#17434)
2022-02-03 14:21:38 +01:00
CODE_OF_CONDUCT.md
Change e-mail contact for CoC enforcement
2019-06-06 17:42:07 +02:00
config.ru
…
CONTRIBUTING.md
Merge branch 'main' into glitch-soc/merge-upstream
2021-07-13 17:57:15 +02:00
crowdin.yml
Prevent translations from accidentally becoming completely different from source strings on Crowdin without translators noticing. (#17085)
2021-12-01 19:03:35 +01:00
docker-compose.yml
Add healthcheck for sidekiq (#17365)
2022-01-26 18:08:49 +01:00
Dockerfile
Bump NODE_VER to 16.13.2, to solve security issues (#17399)
2022-01-31 00:32:03 +01:00
FEDERATION.md
Add FEDERATION.md (#17029)
2021-11-23 00:15:31 +01:00
Gemfile
Merge branch 'main' into glitch-soc/merge-upstream
2022-01-28 08:58:32 +01:00
Gemfile.lock
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-06 15:34:42 +01:00
ide-helper.js
Add JS IDE helper (#13012)
2020-04-27 17:19:53 +02:00
LICENSE
…
package.json
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-06 15:34:42 +01:00
postcss.config.js
Increase files checked by ESLint (#9705)
2019-01-04 11:28:38 +01:00
priv-config
…
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
Rakefile
…
README.md
Add line about using vagrant-hostsupdater in the Vagrant short guide (#17243)
2022-01-16 16:55:41 +01:00
scalingo.json
Change references to tootsuite/mastodon to mastodon/mastodon (#16491)
2021-07-13 15:46:20 +02:00
SECURITY.md
Fix security policy (#16248)
2021-05-16 23:50:16 +02:00
Vagrantfile
Merge branch 'main' into glitch-soc/merge-upstream
2021-10-14 22:14:26 +02:00
yarn.lock
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-06 15:34:42 +01: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?

Description
Wobbl.xyz Mastodon Instance code
Readme 204 MiB
Languages
Ruby 57.6%
JavaScript 26.6%
SCSS 10%
Haml 5.5%
HTML 0.2%