djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-23 16:44:04 -05:00
Code Issues Packages Projects Releases Wiki Activity
A glitchy but lovable microblogging server https://toot-lab.reclaim.technology/
14,910 Commits 69 Branches 20 Tags 372 MiB
Ruby 47.8%
JavaScript 30.8%
TypeScript 9.9%
SCSS 7.8%
Haml 3.3%
Other 0.4%
1fbd1fa5c4
Go to file
Claire 1fbd1fa5c4 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/settings/preferences_controller.rb`:
  Conflicts due to us having more user settings and upstream dropping
  `hide_network` (to replace it with an account attribute, properly migrated).
  Dropped `hide_network` like upstream.
- `app/lib/user_settings_decorator.rb`:
  Conflicts due to us having more user settings and upstream dropping
  `hide_network` (to replace it with an account attribute, properly migrated).
  Dropped `hide_network` like upstream.
- `app/models/status.rb`:
  Conflict because of slight change in how glitch-soc handles the scope to
  filter out local-only posts for anonymous viewers.
  Took upstream's changes and re-applied glitch-soc's change.
- `app/models/user.rb`:
  Conflicts due to us having more user settings and upstream dropping
  `hide_network` (to replace it with an account attribute, properly migrated).
  Dropped `hide_network` like upstream.
- `app/views/directories/index.html.haml`:
  Conflict because upstream redesigned that page while glitch-soc had a minor
  change to support hiding the number of followers.
  Ported glitch-soc's change on top of upstream's redesign.

Additional changes:
- `app/models/account_statuses_filter.rb`:
  See change to `app/models/status.rb`.
2022-03-08 20:22:54 +01:00
.circleci Add more migration tests (#17710) 2022-03-07 23:40:55 +01:00
.github Merge branch 'main' into glitch-soc/merge-upstream 2022-02-23 18:13:12 +01:00
app Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
bin Update Mastodon to Rails 6.1 (#15910) 2021-03-24 10:44:31 +01:00
chart Helm chart SSO support (#17205) 2022-02-11 15:01:40 +01:00
config Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
db Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
dist Also compress SVG and ICO images in nginx (#17651) 2022-02-26 17:27:11 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +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 2022-02-01 20:59:28 +01:00
spec Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
streaming Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +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 Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
.env.nanobox Remove support for OAUTH_REDIRECT_AT_SIGN_IN (#17287) 2022-01-23 15:50:41 +01:00
.env.production.sample Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +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 Update .dockerignore/.gitignore for #16947 etc (#17099) 2021-12-06 18:04:04 +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 Add trending statuses (#17431) 2022-02-25 00:34:14 +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 Remove protobuf dependencies (#17539) 2022-02-14 16:08:02 +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 Spelling (#17705) 2022-03-06 22:51:40 +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 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 Remove protobuf dependencies (#17539) 2022-02-14 16:08:02 +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-02-26 09:29:23 +01:00
Gemfile.lock Merge branch 'main' into glitch-soc/merge-upstream 2022-03-01 09:59:18 +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 2022-03-01 09:59:18 +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 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 2022-02-17 10:58:44 +01:00
yarn.lock Merge branch 'main' into glitch-soc/merge-upstream 2022-03-01 09:59:18 +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?