mirror of https://github.com/mastodon/mastodon.git synced 2025-01-19 00:21:40 +01:00

Go to file

Thibaut Girka c0dc247bce Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/models/account.rb
- app/views/settings/profiles/show.html.haml
- spec/controllers/api/v1/accounts/credentials_controller_spec.rb

Conflicts were due to an increase in account bio length upstream, which
is already covered in glitch-soc through `MAX_BIO_CHARS`.

2019-05-23 19:01:30 +02:00

.circleci

Fix CircleCI (#9695 )

2019-01-02 20:48:22 +01:00

.github

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

2019-05-23 19:01:30 +02:00

app

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

2019-05-23 19:01:30 +02:00

bin

Bump webpacker from 3.5.5 to 4.0.2 (#10277 )

2019-03-15 15:05:31 +01:00

config

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

2019-05-23 19:01:30 +02:00

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

2019-05-19 17:46:31 +02:00

dist

Cache error 410 responses in recommended nginx configuration (#10425 )

2019-03-30 03:14:31 +01:00

lib

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

2019-05-15 17:11:40 +02:00

log

Initial commit

2016-02-20 22:53:20 +01:00

nanobox

Update Nginx config for Nanobox apps (#9310 )

2018-11-20 22:24:35 +01:00

public

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

2019-05-04 16:37:26 +02:00

spec

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

2019-05-23 19:01:30 +02:00

streaming

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

2019-05-23 19:01:30 +02:00

vendor

Increase files checked by ESLint (#9705 )

2019-01-04 11:28:38 +01:00

.buildpacks

Add ffmpeg buildpack for scalingo (#8500 )

2018-08-29 01:21:23 +02:00

.codeclimate.yml

Upgrade ESLint to v5.x (#9694 )

2019-01-02 07:28:53 +01: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

Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423 )

2018-08-25 13:27:08 +02:00

.env.production.sample

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

2019-05-10 17:09:12 +02:00

.env.test

Do not test PAM authentication by default (#9027 )

2018-10-20 07:32:26 +02:00

.env.vagrant

update vagrant configs (#8706 )

2018-09-16 14:49:15 -04:00

.eslintignore

Increase files checked by ESLint (#9705 )

2019-01-04 11:28:38 +01:00

.eslintrc.js

Refactor icons in web UI to use Icon component (#9951 )

2019-02-01 00:14:05 +01:00

.foreman

Replace sprockets/browserify with Webpack (#2617 )

2017-05-03 02:04:16 +02:00

.gitattributes

Add .gitattributes file to avoid unwanted CRLF (#3954 )

2017-06-26 13:15:24 +02:00

.gitignore

Ignore elasticsearch directory (#7070 )

2018-04-08 16:57:16 +09:00

.gitmodules

Rename themes -> flavours ? ?

2017-12-03 23:26:40 -08:00

.haml-lint.yml

Added haml-lint and fix warnings (#2773 )

2017-05-08 03:35:25 +02:00

.nanoignore

Remove Storybook (#4397 )

2017-07-27 22:30:27 +02:00

.nvmrc

Upgrade Node.js to v8.x on nvmrc (#8023 )

2018-07-15 12:29:17 +09:00

.profile

Add ffmpeg and dependent packages as well as LD_LIBRARY_PATHs (#3276 )

2017-05-24 17:57:33 +02:00

.rspec

Adding a Mention model, test stubs

2016-02-25 00:17:01 +01:00

.rubocop.yml

Add tootctl self-destruct (#10367 )

2019-03-28 17:56:25 +01:00

.ruby-version

Upgrade Ruby to 2.6.1 (#9956 )

2019-02-20 11:57:08 +01:00

.scss-lint.yml

Enable CodeClimate SCSS Lint checks (#2886 )

2017-05-07 20:47:31 +02:00

.slugignore

Remove Storybook (#4397 )

2017-07-27 22:30:27 +02:00

.yarnclean

Reduce container size with clean yarn (#3506 )

2017-09-30 22:05:24 +02:00

app.json

Change logo URL for Heroku and Scalingo (#4476 )

2017-08-01 05:59:11 +02:00

Aptfile

Adjust Aptfile for Heroku-18 stack (#8588 )

2018-09-09 02:10:58 +02:00

AUTHORS.md

Bump version to 2.8.0rc1 (#10340 )

2019-03-30 02:13:42 +01:00

babel.config.js

Weblate translations (2019-04-10) (#10545 )

2019-04-10 18:17:24 +02:00

boxfile.yml

[Nanobox] Enable ElasticSearch support by default (#6977 )

2018-03-31 13:17:25 +02:00

Capfile

remove capistrano/faster_assets from Capfile (#2737 )

2017-05-03 12:14:52 +02:00

CHANGELOG.md

Bump version to 2.8.2 (#10703 )

2019-05-05 17:14:15 +02:00

CODE_OF_CONDUCT.md

update code of conduct email address

2017-11-21 11:01:28 -05:00

config.ru

Fix rubocop issues, introduce usage of frozen literal to improve performance

2016-11-15 16:56:29 +01:00

CONTRIBUTING.md

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

2019-05-19 17:46:31 +02:00

docker-compose.yml

Upgrade redis in docker-compose.yml from 4 to 5 (#9063 )

2019-05-19 11:29:26 +02:00

Dockerfile

Re-organize Dockerfile to improve incremental builds. (#10212 )

2019-03-08 16:12:48 +01:00

Gemfile

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

2019-05-23 19:01:30 +02:00

Gemfile.lock

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

2019-05-23 19:01:30 +02:00

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

2019-05-23 19:01:30 +02:00

postcss.config.js

Increase files checked by ESLint (#9705 )

2019-01-04 11:28:38 +01:00

priv-config

TOR federation (#7875 )

2018-06-26 20:34:12 +02:00

Procfile

More robust PuSH subscription refreshes (#2799 )

2017-05-05 02:23:01 +02:00

Procfile.dev

Fix Procfile on OS X (#6748 )

2018-03-12 03:50:40 +01:00

Rakefile

Initial commit

2016-02-20 22:53:20 +01:00

README.md

2019-01-28 22:57:42 +01:00

scalingo.json

Add ffmpeg buildpack for scalingo (#8500 )

2018-08-29 01:21:23 +02:00

Vagrantfile

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

2019-03-10 16:48:44 +01:00

yarn.lock

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

2019-05-23 19:01:30 +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 64.4%

JavaScript 17.3%

TypeScript 8.7%

SCSS 4.7%

Haml 4.4%

Other 0.5%