A glitchy but lovable microblogging server
Go to file
Claire 3c7dbf3a16 Merge commit '5694e24bbf9afccbbf1b44d3a405a4e2bc0ff08d' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream changed the environment variables used for defining the version
  number. This change occurs close to lines that were modified in glitch-soc
  to account for the different repositories to push to.
  Ported upstream changes.
- `.github/workflows/build-push-pr.yml`:
  Upstream changed the environment variables used for defining the version
  number. This change occurs close to lines that were modified in glitch-soc
  to account for the different repositories to push to.
  Ported upstream changes.
- `lib/mastodon/version.rb`:
  Upstream changed how the version string is built from environment variables.
  Adapted the logic to account for the `+glitch` in glitch-soc.
2023-09-02 11:56:09 +02:00
.devcontainer Do not start LibreTranslate and Elasticsearch on GitHub Codespaces (#26382) 2023-08-21 08:51:37 +02:00
.github Merge commit '5694e24bbf9afccbbf1b44d3a405a4e2bc0ff08d' into glitch-soc/merge-upstream 2023-09-02 11:56:09 +02:00
.husky
app Merge commit '5694e24bbf9afccbbf1b44d3a405a4e2bc0ff08d' into glitch-soc/merge-upstream 2023-09-02 11:56:09 +02:00
bin
chart
config Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream 2023-09-02 11:41:40 +02:00
db Merge commit 'ee702e36e58d638bcf75b2eae2ca86499693465e' into glitch-soc/merge-upstream 2023-08-24 20:55:28 +02:00
dist Make mastodon-streaming systemd unit templated (#24751) 2023-08-07 15:41:34 +02:00
lib Merge commit '5694e24bbf9afccbbf1b44d3a405a4e2bc0ff08d' into glitch-soc/merge-upstream 2023-09-02 11:56:09 +02:00
log
public Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main 2023-08-13 18:47:15 +02:00
spec Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream 2023-09-02 11:41:40 +02:00
streaming Merge commit 'ee702e36e58d638bcf75b2eae2ca86499693465e' into glitch-soc/merge-upstream 2023-08-24 20:55:28 +02:00
vendor
.browserslistrc
.buildpacks
.dockerignore
.editorconfig
.env.production.sample
.env.test
.env.vagrant Add elastic search installation into Vagrantfile (#26512) 2023-08-23 15:46:14 +02:00
.eslintignore
.eslintrc.js
.foreman
.gitattributes
.gitignore
.gitmodules
.haml-lint.yml
.haml-lint_todo.yml
.nanoignore
.nvmrc
.prettierignore
.prettierrc.js
.profile
.rspec
.rubocop.yml
.rubocop_todo.yml Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream 2023-08-24 21:26:27 +02:00
.ruby-gemset
.ruby-version
.slugignore
.yarnclean
app.json
Aptfile
AUTHORS.md
babel.config.js
Capfile
CHANGELOG.md Fix changelog wording and missing items (#26638) 2023-08-24 21:07:39 +02:00
CODE_OF_CONDUCT.md
config.ru
CONTRIBUTING.md
crowdin-glitch.yml
crowdin.yml
docker-compose.yml Bump version to v4.1.6 (#26272) 2023-07-31 21:11:25 +02:00
Dockerfile Change the pre-release versioning scheme and associated environment variables (#26653) 2023-08-25 18:26:44 +02:00
FEDERATION.md
Gemfile Merge commit 'e3fd07197379f1ac7fd4a761b3ff55effa1a2a6c' into glitch-soc/merge-upstream 2023-08-24 21:50:14 +02:00
Gemfile.lock Update dependency rspec-sidekiq to v4 (#26627) 2023-08-24 09:03:40 +02:00
ide-helper.js
jest.config.js
jsconfig.json
LICENSE
package.json Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream 2023-08-24 21:26:27 +02:00
postcss.config.js
priv-config
Procfile
Procfile.dev
Rakefile
README.md
scalingo.json
SECURITY.md Update SECURITY.md to indicate issues can be reported on Github (#26599) 2023-08-22 16:47:19 +02:00
stylelint.config.js
tsconfig.json
Vagrantfile Add elastic search installation into Vagrantfile (#26512) 2023-08-23 15:46:14 +02:00
yarn.lock Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream 2023-09-02 11:41:40 +02: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?