mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-12 06:06:22 +01:00
Code Issues Projects Releases Wiki Activity
14,407 Commits 135 Branches 269 Tags 886 MiB
Ruby 63.9%
JavaScript 18.4%
TypeScript 8%
SCSS 4.8%
Haml 4.5%
Other 0.4%
9b861d56a9
Go to file
Claire 9b861d56a9 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Copied upstream changes.
- `app/controllers/settings/identity_proofs_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `app/controllers/well_known/keybase_proof_config_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `lib/mastodon/statuses_cli.rb`:
  Minor conflict due to an optimization that wasn't shared between
  the two versions. Copied upstream's version.
2021-11-26 22:53:55 +01:00
.circleci Ruby 3.0.2 Upgrade (#16982) 2021-11-18 21:59:57 +01:00
.github Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 18:42:18 +01:00
app Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
bin Update Mastodon to Rails 6.1 (#15910) 2021-03-24 10:44:31 +01:00
chart Update Helm release elasticsearch to v15.10.3 (#16651) 2021-10-14 21:01:27 +02:00
config Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
db Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
dist templates/systemd/mastodon: update sandbox mode (#16235) 2021-10-25 16:31:20 +02:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
log Initial commit 2016-02-20 22:53:20 +01:00
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 2021-06-03 20:47:02 +02:00
spec Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
streaming Merge branch 'main' into glitch-soc/merge-upstream 2021-10-13 15:50:24 +02: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 Ignore git related files from docker build (#16282) 2021-05-22 17:43:07 +02:00
.editorconfig Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
.env.nanobox Fix ElasticSearch to Elasticsearch (#17050) 2021-11-26 08:30:02 +01:00
.env.production.sample Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +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 Replace sprockets/browserify with Webpack (#2617) 2017-05-03 02:04:16 +02:00
.gitattributes Add .gitattributes file to avoid unwanted CRLF (#3954) 2017-06-26 13:15:24 +02:00
.gitignore helm: pin versions, commit lockfile (#15749) 2021-02-19 09:56:40 +01:00
.gitmodules Rename themes -> flavours ? ? 2017-12-03 23:26:40 -08:00
.haml-lint.yml Added haml-lint and fix warnings (#2773) 2017-05-08 03:35:25 +02:00
.nanoignore Remove Storybook (#4397) 2017-07-27 22:30:27 +02:00
.nvmrc NodeJS 14 support - circleci/docker/.nvmrc (#16163) 2021-08-10 22:56:13 +02:00
.profile Add ffmpeg and dependent packages as well as LD_LIBRARY_PATHs (#3276) 2017-05-24 17:57:33 +02:00
.rspec Adding a Mention model, test stubs 2016-02-25 00:17:01 +01:00
.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 Remove Storybook (#4397) 2017-07-27 22:30:27 +02:00
.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 remove capistrano/faster_assets from Capfile (#2737) 2017-05-03 12:14:52 +02:00
CHANGELOG.md Forward port version bumps to 3.4.2 and 3.4.3 (#16945) 2021-11-06 05:32:14 +01:00
CODE_OF_CONDUCT.md Change e-mail contact for CoC enforcement 2019-06-06 17:42:07 +02:00
config.ru Fix rubocop issues, introduce usage of frozen literal to improve performance 2016-11-15 16:56:29 +01:00
CONTRIBUTING.md Merge branch 'main' into glitch-soc/merge-upstream 2021-07-13 17:57:15 +02:00
crowdin.yml Update Crowdin configuration file 2019-09-14 11:40:13 +02:00
docker-compose.yml [Docker-Compose] [Breaking] Postgres 9.6 is EOL (11th Nov 2021) - Migrate to 14 Stable (#16947) 2021-11-18 22:00:27 +01:00
Dockerfile Upgrade Ruby to 3.0.3 (#17038) 2021-11-24 20:29:05 +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 2021-11-26 22:53:55 +01:00
Gemfile.lock Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
ide-helper.js Add JS IDE helper (#13012) 2020-04-27 17:19:53 +02:00
LICENSE Fix #49 - License changed from GPL-2.0 to AGPL-3.0 2016-09-21 23:04:34 +02:00
package.json Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
postcss.config.js Increase files checked by ESLint (#9705) 2019-01-04 11:28:38 +01:00
priv-config TOR federation (#7875) 2018-06-26 20:34:12 +02:00
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 Initial commit 2016-02-20 22:53:20 +01:00
README.md Merge branch 'main' into glitch-soc/merge-upstream 2021-07-13 17:57:15 +02: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 2021-11-26 22:53:55 +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 then it runs on dev.glitch.social and anyone who uses that does so absolutely at their own risk. can you dig it?