Go to file

Claire 3160e050a9 Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/helpers/accounts_helper.rb`:
  Conflict due to upstream changing how followers count is displayed while we
  have an option to hide followers count.
  Ported upstream change.
- `app/views/accounts/_header.html.haml`:
  Conflict due to upstream changing how followers count is displayed while we
  have an option to hide followers count.
  Ported upstream change.
- `app/views/directories/index.html.haml`:
  Conflict due to upstream changing how followers count is displayed while we
  have an option to hide followers count.
  Ported upstream change.

2021-07-08 16:17:19 +02:00

.circleci

Add Actions for check i18n (#16285 )

2021-05-22 15:00:20 +02:00

.github

Merge branch 'main' into glitch-soc/merge-upstream

2021-06-30 00:42:52 +02:00

app

Merge branch 'main' into glitch-soc/merge-upstream

2021-07-08 16:17:19 +02:00

bin

Update Mastodon to Rails 6.1 (#15910 )

2021-03-24 10:44:31 +01:00

chart

helm: upgrade elasticsearch chart to 14 (#15767 )

2021-03-12 05:39:09 +01:00

config

Merge branch 'main' into glitch-soc/merge-upstream

2021-07-08 16:17:19 +02:00

Merge branch 'main' into glitch-soc/merge-upstream

2021-07-08 16:17:19 +02:00

dist

Preload libjemalloc.so for long-running Ruby (#16462 )

2021-07-05 19:16:35 +02:00

lib

Merge branch 'main' into glitch-soc/merge-upstream

2021-07-08 16:17:19 +02:00

log

…

nanobox

…

public

Merge branch 'main' into glitch-soc/merge-upstream

2021-06-03 20:47:02 +02:00

spec

Merge branch 'main' into glitch-soc/merge-upstream

2021-07-08 16:17:19 +02:00

streaming

Merge branch 'main' into glitch-soc/merge-upstream

2021-05-07 18:21:59 +02:00

vendor

…

.buildpacks

…

.codeclimate.yml

Bump rubocop from 1.8.1 to 1.9.1 (#15677 )

2021-02-12 00:10:00 +09:00

.deepsource.toml

Update .deepsource.toml (#15753 )

2021-02-19 09:53:25 +01:00

.dockerignore

Ignore git related files from docker build (#16282 )

2021-05-22 17:43:07 +02:00

.editorconfig

…

.env.nanobox

…

.env.production.sample

Add environment variables to control custom emoji size limits

2021-04-26 11:22:22 +02:00

.env.test

…

.env.vagrant

…

.eslintignore

…

.eslintrc.js

…

.foreman

…

.gitattributes

…

.gitignore

helm: pin versions, commit lockfile (#15749 )

2021-02-19 09:56:40 +01:00

.gitmodules

…

.haml-lint.yml

…

.nanoignore

…

.nvmrc

…

.profile

…

.rspec

…

.rubocop.yml

Fix rubocop config and warnings (#15503 )

2021-01-07 09:40:55 +01:00

.ruby-version

Revert default Ruby version to 2.7.2 (#16154 )

2021-05-04 23:06:19 +02:00

.sass-lint.yml

…

.slugignore

…

.yarnclean

…

app.json

…

Aptfile

Use libvpx >= 5 (#15591 )

2021-01-22 10:09:40 +01:00

AUTHORS.md

Bump version to 3.4.0 (#16239 )

2021-05-16 23:55:07 +02:00

babel.config.js

Remove dependency for @babel/plugin-proposal-class-properties (#16155 )

2021-05-04 23:13:04 +02:00

boxfile.yml

…

Capfile

…

CHANGELOG.md

Bump version to 3.4.1 (#16350 )

2021-06-03 04:26:02 +02:00

CODE_OF_CONDUCT.md

…

config.ru

…

CONTRIBUTING.md

Merge branch 'main' into glitch-soc/merge-upstream

2021-05-17 10:30:34 +02:00

crowdin.yml

…

docker-compose.yml

…

Dockerfile

Revert default Ruby version to 2.7.2 (#16154 )

2021-05-04 23:06:19 +02:00

Gemfile

Merge branch 'main' into glitch-soc/merge-upstream

2021-07-08 16:17:19 +02:00

Gemfile.lock

Merge branch 'main' into glitch-soc/merge-upstream

2021-07-08 16:17:19 +02:00

ide-helper.js

…

LICENSE

…

package.json

Merge branch 'main' into glitch-soc/merge-upstream

2021-07-08 16:17:19 +02:00

postcss.config.js

…

priv-config

…

Procfile

…

Procfile.dev

…

Rakefile

…

README.md

Change IRC channel to LiberaChat in README (#16279 )

2021-05-24 05:16:45 +02:00

scalingo.json

…

SECURITY.md

Fix security policy (#16248 )

2021-05-16 23:50:16 +02:00

Vagrantfile

Merge branch 'main' into glitch-soc/merge-upstream

2021-05-17 10:30:34 +02:00

yarn.lock

Merge branch 'main' into glitch-soc/merge-upstream

2021-07-08 16:17:19 +02:00

README.md

Mastodon Glitch Edition

Now with automated deploys!

So here's the deal: we all work on this code, and then it runs on dev.glitch.social and anyone who uses that does so absolutely at their own risk. can you dig it?

You can view documentation for this project at glitch-soc.github.io/docs/.
And contributing guidelines are available here and here.

Languages

Ruby 57.6%

JavaScript 26.6%

SCSS 10%

Haml 5.5%

HTML 0.2%