0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-25 06:36:45 +00:00
A glitchy but lovable microblogging server
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 () 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 () 2021-03-24 10:44:31 +01:00
chart Helm chart SSO support () 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 () 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
nanobox
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
.buildpacks Remove nodejs buildpack from buildpacks () 2020-07-20 09:48:10 +02:00
.codeclimate.yml Exclude locale files from Code Climate () 2021-10-18 12:04:42 +02:00
.deepsource.toml Update .deepsource.toml () 2021-02-19 09:53:25 +01:00
.dockerignore Update .dockerignore/.gitignore for etc () 2021-12-06 18:04:04 +01:00
.editorconfig
.env.nanobox Remove support for OAUTH_REDIRECT_AT_SIGN_IN () 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
.env.vagrant Add a default DB_HOST to .env.vagrant for enable the streaming () 2020-06-15 01:57:06 +02:00
.eslintignore
.eslintrc.js Enable promise/catch-or-return allowFinally () 2020-07-11 23:51:22 +02:00
.foreman
.gitattributes
.gitignore Update .dockerignore/.gitignore for etc () 2021-12-06 18:04:04 +01:00
.gitmodules
.haml-lint.yml
.nanoignore
.nvmrc NodeJS 14 support - circleci/docker/.nvmrc () 2021-08-10 22:56:13 +02:00
.profile
.rspec
.rubocop.yml Add trending statuses () 2022-02-25 00:34:14 +01:00
.ruby-version Upgrade Ruby to 3.0.3 () 2021-11-24 20:29:05 +01:00
.sass-lint.yml
.slugignore
.yarnclean
app.json Change references to tootsuite/mastodon to mastodon/mastodon () 2021-07-13 15:46:20 +02:00
Aptfile Remove protobuf dependencies () 2022-02-14 16:08:02 +01:00
AUTHORS.md Change references to tootsuite/mastodon to mastodon/mastodon () 2021-07-13 15:46:20 +02:00
babel.config.js Remove dependency for @babel/plugin-proposal-class-properties () 2021-05-04 23:13:04 +02:00
boxfile.yml Fix to isolate the sidekiq process that runs the scheduler job () 2020-12-15 03:04:03 +01:00
Capfile
CHANGELOG.md Spelling () 2022-03-06 22:51:40 +01:00
CODE_OF_CONDUCT.md
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. () 2021-12-01 19:03:35 +01:00
docker-compose.yml Add healthcheck for sidekiq () 2022-01-26 18:08:49 +01:00
Dockerfile Remove protobuf dependencies () 2022-02-14 16:08:02 +01:00
FEDERATION.md Add FEDERATION.md () 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
LICENSE
package.json Merge branch 'main' into glitch-soc/merge-upstream 2022-03-01 09:59:18 +01:00
postcss.config.js
priv-config
Procfile fix: make Procfile compatible with herokuish () 2020-08-29 19:00:30 +02:00
Procfile.dev Set RAILS_ENV in Procfile.dev () 2021-01-07 09:30:12 +01:00
Rakefile
README.md Remove reference to dev.glitch.social from README 2022-01-10 20:59:26 +01:00
scalingo.json Change references to tootsuite/mastodon to mastodon/mastodon () 2021-07-13 15:46:20 +02:00
SECURITY.md Fix security policy () 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

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?