A glitchy but lovable microblogging server
Go to file
Thibaut Girka 0437d70628 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/follower_accounts_controller.rb`:
  Conflict due to upstream changing suspension logic while
  glitch-soc has an extra option to hide followers count.
  Ported upstream changes.
2020-11-08 14:20:35 +01:00
.circleci
.github Merge branch 'master' into glitch-soc/merge-upstream 2020-06-30 23:00:20 +02:00
app Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
bin fix: make Procfile compatible with herokuish (#12685) 2020-08-29 19:00:30 +02:00
chart Fix postrgres secret name for cronjob (#15072) 2020-11-02 06:16:51 +01:00
config Merge branch 'master' into glitch-soc/merge-upstream 2020-11-07 18:23:02 +01:00
db Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
dist Update nginx.conf (#13066) 2020-03-08 16:04:25 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
log Initial commit 2016-02-20 22:53:20 +01:00
nanobox Resync Nanobox files with the 2.9.0 release (#11083) 2019-06-14 14:52:31 +02:00
public Merge branch 'master' into glitch-soc/merge-upstream 2020-09-28 14:13:30 +02:00
spec Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
streaming
vendor Increase files checked by ESLint (#9705) 2019-01-04 11:28:38 +01:00
.buildpacks
.codeclimate.yml Removed disabling comments for Style/MethodMissingSuper (#15014) 2020-10-20 09:13:39 +02:00
.dockerignore Add .bundle to .dockerignore (#7895) 2018-06-26 20:33:29 +02:00
.editorconfig Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
.env.nanobox Fix sample SAML_ACS_URL, SAML_ISSUER (#12669) 2019-12-23 18:12:22 +01:00
.env.production.sample
.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 Increase files checked by ESLint (#9705) 2019-01-04 11:28:38 +01:00
.eslintrc.js
.foreman
.gitattributes
.gitignore
.gitmodules
.haml-lint.yml
.nanoignore
.nvmrc Upgrade .nvmrc to Node.js 12 (#12906) 2020-01-21 12:42:13 +01:00
.profile
.rspec Adding a Mention model, test stubs 2016-02-25 00:17:01 +01:00
.rubocop.yml Bump rubocop from 0.86.0 to 0.88.0 (#14412) 2020-09-01 03:04:00 +02:00
.ruby-version Update .ruby-version (#13395) 2020-04-05 13:58:43 +02:00
.sass-lint.yml
.slugignore
.yarnclean
app.json
Aptfile Stop installing libssl-dev for build (#14660) 2020-08-25 01:20:59 +02:00
AUTHORS.md
babel.config.js
boxfile.yml
Capfile remove capistrano/faster_assets from Capfile (#2737) 2017-05-03 12:14:52 +02:00
CHANGELOG.md Bump version to 3.2.0 (#14395) 2020-07-27 00:07:26 +02:00
CODE_OF_CONDUCT.md Change e-mail contact for CoC enforcement 2019-06-06 17:42:07 +02:00
config.ru
CONTRIBUTING.md
crowdin.yml
docker-compose.yml
Dockerfile
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2020-10-26 15:48:16 +01:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2020-11-07 18:23:02 +01:00
ide-helper.js
LICENSE Fix #49 - License changed from GPL-2.0 to AGPL-3.0 2016-09-21 23:04:34 +02:00
package.json Merge branch 'master' into glitch-soc/merge-upstream 2020-11-07 18:23:02 +01:00
postcss.config.js
priv-config
Procfile
Procfile.dev Fix Procfile on OS X (#6748) 2018-03-12 03:50:40 +01:00
Rakefile
README.md
scalingo.json
SECURITY.md
Vagrantfile
yarn.lock Merge branch 'master' into glitch-soc/merge-upstream 2020-11-07 18:23:02 +01:00

Mastodon Glitch Edition

Now with automated deploys!

Build Status

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?