tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,384 Commits 10 Branches 0 Tags
193250556cb4e6b1b3e2f9bd1ac023b290176fd4
T
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Claire 193250556c Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream changed their README, we have our own.
  Kept ours.
- `app/helpers/application_helper.rb`:
  Minor code style fix upstream, on a line that is different in glitch-soc
  due to the different theming system.
  Applied the code style fix to our own code.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Code style fix on a line next to lines exclusive to glitch-soc.
  Applied upstream changes.
- `yarn.lock`:
  Upstream updated a dependency textually close to a glitch-soc-only
  dependency.
  Updated the dependency like upstream did.
2023-03-16 23:12:59 +01:00
.devcontainer
Sync CI and Docker Compose image versions (#24053)
2023-03-10 11:10:47 +01:00
.github
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-16 23:12:59 +01:00
app
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-16 23:12:59 +01:00
bin
Fix sidekiq jobs not triggering Elasticsearch index updates (#24046)
2023-03-12 23:47:55 +01:00
chart
helm: cleanup helm chart, now in mastodon/chart (#21801)
2022-12-09 06:36:29 +01:00
config
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-16 23:12:59 +01:00
db
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-05 20:46:56 +01:00
dist
…
lib
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-16 23:12:59 +01:00
log
…
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-16 23:12:59 +01:00
streaming
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-15 09:16:10 +01:00
vendor
…
.browserslistrc
…
.buildpacks
…
.bundler-audit.yml
Run bundler-audit on PRs (#23514)
2023-02-18 12:49:09 +01:00
.codeclimate.yml
Run bundler-audit on PRs (#23514)
2023-02-18 12:49:09 +01:00
.dockerignore
…
.editorconfig
Enable EditorConfig trailing whitespace trimming (#23543)
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
…
.env.vagrant
…
.eslintignore
…
.eslintrc.js
Rename JSX files with proper .jsx extension (#23733)
2023-02-20 03:20:59 +01:00
.foreman
…
.gitattributes
…
.gitignore
helm: cleanup helm chart, now in mastodon/chart (#21801)
2022-12-09 06:36:29 +01:00
.gitmodules
…
.haml-lint_todo.yml
Fix more haml-lint Rubocop (#24107)
2023-03-15 20:07:43 +01:00
.haml-lint.yml
Setup haml-lint CI with todo config (#23524)
2023-03-15 04:15:36 +01:00
.nanoignore
…
.nvmrc
Sync Node.js to 16.19 patch release (#23554)
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
…
.profile
…
.rspec
…
.rubocop_todo.yml
Ignore additional Style/OptionalBooleanParameter (#24138)
2023-03-16 23:07:25 +01:00
.rubocop.yml
Roll back unintentionally activated rubocop rules (#24132)
2023-03-16 22:24:01 +01:00
.ruby-gemset
…
.ruby-version
Upgrade to Ruby 3.2 (#22928)
2023-02-15 08:30:27 +01:00
.slugignore
…
.yarnclean
Replace from scss-lint to sass-lint (#10958)
2019-06-04 17:23:18 +02:00
app.json
…
Aptfile
Remove packages that are provided by Heroku stacks (#19836)
2022-12-15 18:55:29 +01:00
AUTHORS.md
…
babel.config.js
…
Capfile
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
CHANGELOG.md
Fix Markdown files with Prettier and check in CI (#21972)
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 (#23679)
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 (#2030)
2022-12-21 22:13:22 +01:00
crowdin.yml
…
docker-compose.yml
Use Github Container Registry as the official container image source (#24113)
2023-03-15 16:41:13 +01:00
Dockerfile
Upgrade to Ruby 3.2 (#22928)
2023-02-15 08:30:27 +01:00
FEDERATION.md
…
Gemfile
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-16 23:12:59 +01:00
Gemfile.lock
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-16 23:12:59 +01:00
ide-helper.js
…
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 (#21832)
2022-12-03 12:05:35 +09:00
LICENSE
…
package.json
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-16 23:12:59 +01:00
postcss.config.js
Update PostCSS dependencies (#23835)
2023-03-15 04:01:10 +01:00
priv-config
…
Procfile
…
Procfile.dev
…
Rakefile
…
README.md
Use Github Container Registry as the official container image source (#24113)
2023-03-15 16:41:13 +01:00
scalingo.json
…
SECURITY.md
Fix Markdown files with Prettier and check in CI (#21972)
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-16 23:12:59 +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?

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%