tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,628 Commits 10 Branches 0 Tags
993d0a99505ae69b6a16b56b5ab3bfe3af3f32f6
T
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Claire 993d0a9950 Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/account.rb`:
  Upstream added new validations close to lines on which glitch-soc had
  modified validations to handle custom limits set through environment
  variables.
  Ported upstream changes.
- `config/initializers/content_security_policy.rb`:
  Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is
  completely different.
  Added `AZURE_ALIAS_HOST` to our version of the file.
2023-07-30 13:15:01 +02:00
.devcontainer
Update mcr.microsoft.com/devcontainers/ruby Docker tag to v1 (#25613)
2023-06-27 11:28:07 +02:00
.github
Fix Crowdin Github Action (#2311)
2023-07-19 08:36:25 +02:00
.husky
…
app
Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream
2023-07-30 13:15:01 +02:00
bin
Move the mastodon/*_cli files to mastodon/cli/* (#24139)
2023-05-23 16:08:26 +02:00
chart
…
config
Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream
2023-07-30 13:15:01 +02:00
db
Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream
2023-07-13 13:35:15 +02:00
dist
Add hardened headers to user-uploaded files (#25756)
2023-07-06 14:31:37 +02:00
lib
Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream
2023-07-12 16:03:05 +02:00
log
…
public
…
spec
Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream
2023-07-30 13:15:01 +02:00
streaming
Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream
2023-06-18 10:36:14 +02:00
vendor
…
.browserslistrc
…
.buildpacks
…
.bundler-audit.yml
…
.dockerignore
…
.editorconfig
…
.env.production.sample
…
.env.test
…
.env.vagrant
…
.eslintignore
…
.eslintrc.js
Add eslint rule to forbid vanilla imports in glitch (#2293)
2023-07-13 21:36:23 +02:00
.foreman
…
.gitattributes
…
.gitignore
…
.gitmodules
…
.haml-lint_todo.yml
Fix haml-lint Rubocop Lint/UnusedBlockArguments cop (#26039)
2023-07-20 17:03:39 +02:00
.haml-lint.yml
Consistently use middle dot (·) instead of bullet (•) to separate items (#25248)
2023-06-02 19:58:18 +02:00
.nanoignore
…
.nvmrc
…
.prettierignore
Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream
2023-06-10 15:32:29 +02:00
.prettierrc.js
Use Prettier for ESLint formatting TypeScript (#23631)
2023-05-09 19:02:12 +02:00
.profile
Make it possible to upload audio and video to Heroku app (#24866)
2023-05-05 14:41:07 +02:00
.rspec
…
.rubocop_todo.yml
Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream
2023-07-30 13:15:01 +02:00
.rubocop.yml
Run Rubocop on Rakefile (#23871)
2023-07-12 09:47:54 +02:00
.ruby-gemset
…
.ruby-version
…
.slugignore
…
.yarnclean
…
app.json
…
Aptfile
Make it possible to upload audio and video to Heroku app (#24866)
2023-05-05 14:41:07 +02:00
AUTHORS.md
…
babel.config.js
Update babel monorepo to v7.22.5 (#25405)
2023-06-14 09:22:54 +02:00
Capfile
…
CHANGELOG.md
Fix changelog referencing wrong API version (#25857)
2023-07-11 14:53:58 +02:00
CODE_OF_CONDUCT.md
Update Contributor Covenant to 2.1 (#23980)
2023-04-23 23:11:50 +02:00
config.ru
…
CONTRIBUTING.md
…
crowdin-glitch.yml
Fix Crowdin Github Action (#2311)
2023-07-19 08:36:25 +02:00
crowdin.yml
Add a Github Action to send translations to Crowdin for each merge in main (#25869)
2023-07-18 16:56:01 +02:00
docker-compose.yml
…
Dockerfile
Fix minor typos in comments and spec names (#21831)
2023-05-19 17:13:29 +02:00
FEDERATION.md
…
Gemfile
Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream
2023-07-30 13:15:01 +02:00
Gemfile.lock
Paperclip: add support for Azure blob storage (#23607)
2023-07-19 09:02:49 +02:00
ide-helper.js
…
jest.config.js
Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream
2023-06-10 15:32:29 +02:00
jsconfig.json
…
LICENSE
…
package.json
Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream
2023-07-13 22:40:15 +02:00
postcss.config.js
…
priv-config
…
Procfile
…
Procfile.dev
…
Rakefile
Run Rubocop on Rakefile (#23871)
2023-07-12 09:47:54 +02:00
README.md
Add MacOS M1/2 setup steps to README (#25682)
2023-07-18 09:02:45 +02:00
scalingo.json
Add S3 region list reference to Scalingo config (#24152)
2023-04-26 16:46:19 +02:00
SECURITY.md
…
stylelint.config.js
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-29 10:44:56 +02:00
tsconfig.json
Merge commit '8f66126b1010e0aaaa8b5f2a2f4ea8a28824e2b7' into glitch-soc/merge-upstream
2023-05-28 13:55:30 +02:00
Vagrantfile
…
yarn.lock
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-17 19:02:23 +02: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?

Reference in New Issue View Git Blame Copy Permalink
S
Description
Wobbl.xyz Mastodon Instance code
Readme 204 MiB
Languages
Ruby 57.6%
JavaScript 26.6%
SCSS 10%
Haml 5.5%
HTML 0.2%