T

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

Conflicts:
- `README.md`:
  Upstream updated copyright year, we don't mention it so kept our version.
- `app/controllers/admin/dashboard_controller.rb`:
  Not really a conflict, upstream change (removing the spam checker) too close
  to glitch-soc changes. Ported upstream changes.
- `app/models/form/admin_settings.rb`:
  Same.
- `app/services/remove_status_service.rb`:
  Same.
- `app/views/admin/settings/edit.html.haml`:
  Same.
- `config/settings.yml`:
  Same.
- `config/environments/production.rb`:
  Not a real conflict, upstream added a default HTTP header, but we have
  extra headers in glitch-soc.
  Added the header.

2021-04-20 12:17:14 +02:00

.circleci

Set bundle config in local file, and set path (#14351 )

2020-07-18 19:00:59 +02:00

.github

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

2020-11-20 13:27:48 +01:00

app

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

2021-04-20 12:17:14 +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-04-20 12:17:14 +02:00

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

2021-04-20 12:17:14 +02:00

dist

templates/systemd/mastodon: enable sandbox mode (#15937 )

2021-03-24 10:46:13 +01:00

lib

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

2021-04-20 12:17:14 +02:00

log

…

nanobox

…

public

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

2021-04-20 12:17:14 +02:00

spec

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

2021-04-20 12:17:14 +02:00

streaming

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

2021-03-24 10:53:50 +01:00

vendor

…

.buildpacks

Remove nodejs buildpack from buildpacks (#14364 )

2020-07-20 09:48:10 +02:00

.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

dockerignore helm chart (#15747 )

2021-02-19 09:57:03 +01:00

.editorconfig

…

.env.nanobox

…

.env.production.sample

Support customizing poll option limits

2021-01-26 14:07:31 +01:00

.env.test

…

.env.vagrant

Add a default DB_HOST to .env.vagrant for enable the streaming (#14030 )

2020-06-15 01:57:06 +02:00

.eslintignore

…

.eslintrc.js

Enable promise/catch-or-return allowFinally (#14289 )

2020-07-11 23:51:22 +02:00

.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

Upgrade Ruby to 2.7.3 (#16004 )

2021-04-09 02:31:36 +02:00

.sass-lint.yml

…

.slugignore

…

.yarnclean

…

app.json

Stop using heroku-buildpack-nodejs (#14341 )

2020-07-16 22:01:34 +02:00

Aptfile

Use libvpx >= 5 (#15591 )

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

AUTHORS.md

Bump version to 3.3.0 (#15433 )

2020-12-27 06:00:55 +01:00

babel.config.js

…

boxfile.yml

Fix to isolate the sidekiq process that runs the scheduler job (#15314 )

2020-12-15 03:04:03 +01:00

Capfile

…

CHANGELOG.md

Bump version to 3.3.0 (#15433 )

2020-12-27 06:00:55 +01:00

CODE_OF_CONDUCT.md

…

config.ru

…

CONTRIBUTING.md

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

2021-01-26 14:01:30 +01:00

crowdin.yml

…

docker-compose.yml

Update Elasticsearch from 6.1 to 6.8 in docker-compose.yml (Fix glitch-soc#1348) (#14016 )

2020-06-10 13:57:30 +02:00

Dockerfile

Upgrade Ruby to 2.7.3 (#16004 )

2021-04-09 02:31:36 +02:00

Gemfile

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

2021-04-20 12:17:14 +02:00

Gemfile.lock

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

2021-04-20 12:17:14 +02:00

ide-helper.js

Add JS IDE helper (#13012 )

2020-04-27 17:19:53 +02:00

LICENSE

…

package.json

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

2021-04-20 12:17:14 +02:00

postcss.config.js

…

priv-config

…

Procfile

fix: make Procfile compatible with herokuish (#12685 )

2020-08-29 19:00:30 +02:00

Procfile.dev

Set RAILS_ENV in Procfile.dev (#15502 )

2021-01-07 09:30:12 +01:00

Rakefile

…

README.md

Update copyright year (#16003 )

2021-04-06 11:38:21 +02:00

scalingo.json

…

SECURITY.md

Add Security Policy (#13946 )

2020-06-03 08:32:23 +02:00

Vagrantfile

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

2021-02-12 10:28:32 +01:00

yarn.lock

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

2021-04-20 12:17:14 +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.