me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
help me my masotodon ate a calckey and now it has reactions qts and stuff
17357 commits 2 branches 0 tags 429 MiB
Ruby 43.7%
JavaScript 40.4%
SCSS 11.7%
Haml 4%
HTML 0.1%
Find a file
Claire f39d9ab256 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream switched to pushing to both DockerHub and GitHub Container
  Repository, while glitch-soc was already pushing to the latter only.
  Updated our configuration to be slightly more consistent with upstream's
  naming and styling, but kept our behavior.
- `Gemfile.lock`:
  Updated dependencies textually too close to glitch-soc only hcaptcha
  dependency.
  Updated dependencies as upstream did.
- `README.md`:
  Upstream updated its README, but we have a completely different one.
  Kept our README, though it probably should be reworked at some point.
- `app/views/auth/sessions/two_factor.html.haml`:
  Minor style fix upstream that's on a line glitch-soc removed because
  of its different theming system.
  Kept our file as is.
- `spec/controllers/health_controller_spec.rb`:
  This file apparently did not exist upstream, upstream created it with
  different contents but it is functionally the same.
  Switched to upstream's version of the file.
- `spec/presenters/instance_presenter_spec.rb`:
  Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc
  had its own code because it's a fork and does not have the same default
  source URL.
  Took upstream's change, but with glitch-soc's repo as the default case.
- `yarn.lock`:
  Upstream dependencies textually too close to a glitch-soc only one.
  Updated dependencies as upstream did.
2023-03-15 09:16:10 +01:00
.devcontainer Sync CI and Docker Compose image versions () 2023-03-10 11:10:47 +01:00
.github Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
app Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
bin Fix sidekiq jobs not triggering Elasticsearch index updates () 2023-03-12 23:47:55 +01:00
chart helm: cleanup helm chart, now in mastodon/chart () 2022-12-09 06:36:29 +01:00
config Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
db Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
dist Fix nginx location matching () 2022-11-09 04:12:57 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
log Initial commit 2016-02-20 22:53:20 +01:00
public Merge branch 'main' into glitch-soc/merge-upstream 2023-01-05 14:16:25 +01:00
spec Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
streaming Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
vendor Increase files checked by ESLint () 2019-01-04 11:28:38 +01:00
.browserslistrc Add ES6 compatibility to browserslist () 2022-05-26 20:29:28 +02:00
.buildpacks Remove nodejs buildpack from buildpacks () 2020-07-20 09:48:10 +02:00
.bundler-audit.yml Run bundler-audit on PRs () 2023-02-18 12:49:09 +01:00
.codeclimate.yml Run bundler-audit on PRs () 2023-02-18 12:49:09 +01:00
.dockerignore Update .dockerignore/.gitignore for etc () 2021-12-06 18:04:04 +01:00
.editorconfig Enable EditorConfig trailing whitespace trimming () 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 Bump webpacker from 4.0.7 to 4.2.0 () 2019-11-20 17:56:11 +01:00
.env.vagrant Add a default DB_HOST to .env.vagrant for enable the streaming () 2020-06-15 01:57:06 +02:00
.eslintignore Increase files checked by ESLint () 2019-01-04 11:28:38 +01:00
.eslintrc.js Rename JSX files with proper .jsx extension () 2023-02-20 03:20:59 +01:00
.foreman Replace sprockets/browserify with Webpack () 2017-05-03 02:04:16 +02:00
.gitattributes Add .gitattributes file to avoid unwanted CRLF () 2017-06-26 13:15:24 +02:00
.gitignore helm: cleanup helm chart, now in mastodon/chart () 2022-12-09 06:36:29 +01:00
.gitmodules Rename themes -> flavours ? ? 2017-12-03 23:26:40 -08:00
.haml-lint.yml Setup haml-lint CI with todo config () 2023-03-15 04:15:36 +01:00
.haml-lint_todo.yml Setup haml-lint CI with todo config () 2023-03-15 04:15:36 +01:00
.nanoignore Remove Storybook () 2017-07-27 22:30:27 +02:00
.nvmrc Sync Node.js to 16.19 patch release () 2023-02-13 04:58:37 +01:00
.prettierignore Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
.prettierrc.js Format JSON and YAML using Prettier () 2022-03-21 04:46:11 +01:00
.profile Add ffmpeg and dependent packages as well as LD_LIBRARY_PATHs () 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 Enable RSpec/FilePath () 2023-03-10 16:32:37 +01:00
.rubocop_todo.yml Enable Rubocop Performance/DeleteSuffix () 2023-03-13 00:03:07 +01:00
.ruby-gemset Make Mastodon use its own gemset () 2022-08-13 15:44:34 +02:00
.ruby-version Upgrade to Ruby 3.2 () 2023-02-15 08:30:27 +01:00
.slugignore Remove Storybook () 2017-07-27 22:30:27 +02:00
.yarnclean Replace from scss-lint to sass-lint () 2019-06-04 17:23:18 +02:00
app.json Make enable_starttls configurable by envvars () 2022-11-10 21:06:21 +01:00
Aptfile Remove packages that are provided by Heroku stacks () 2022-12-15 18:55:29 +01:00
AUTHORS.md Update AUTHORS.md () 2022-11-14 08:33:24 +01:00
babel.config.js Remove dependency for @babel/plugin-proposal-class-properties () 2021-05-04 23:13:04 +02:00
Capfile Autofix Rubocop remaining Layout rules () 2023-02-20 06:58:28 +01:00
CHANGELOG.md Fix Markdown files with Prettier and check in CI () 2023-02-20 07:37:28 +01:00
CODE_OF_CONDUCT.md Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
config.ru Autofix Rubocop remaining Layout rules () 2023-02-20 06:58:28 +01:00
CONTRIBUTING.md Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
crowdin-glitch.yml Add crowdin configuration file () 2022-12-21 22:13:22 +01: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 Update docker-compose.yml () 2022-08-27 17:40:46 +02:00
Dockerfile Upgrade to Ruby 3.2 () 2023-02-15 08:30:27 +01:00
FEDERATION.md Add FEDERATION.md () 2021-11-23 00:15:31 +01:00
Gemfile Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
Gemfile.lock Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
ide-helper.js Add JS IDE helper () 2020-04-27 17:19:53 +02:00
jest.config.js Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
jsconfig.json Correct prettier calls for YML/JSON () 2022-12-03 12:05:35 +09:00
LICENSE Fix - 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 2023-03-15 09:16:10 +01:00
postcss.config.js Update PostCSS dependencies () 2023-03-15 04:01:10 +01:00
priv-config TOR federation () 2018-06-26 20:34:12 +02:00
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 Initial commit 2016-02-20 22:53:20 +01:00
README.md Convert CircleCI to GitHub Actions () 2023-03-07 04:49:43 +01:00
scalingo.json Make enable_starttls configurable by envvars () 2022-11-10 21:06:21 +01:00
SECURITY.md Fix Markdown files with Prettier and check in CI () 2023-02-20 07:37:28 +01:00
stylelint.config.js Add glitch-soc's win95.scss and reset.scss to stylelint's ingore list 2023-02-25 23:45:30 +01:00
Vagrantfile Merge branch 'main' into glitch-soc/merge-upstream 2022-12-07 09:03:42 +01:00
yarn.lock Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +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?