mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-12 06:06:22 +01:00
Code Issues Projects Releases Wiki Activity
13,334 Commits 135 Branches 269 Tags 886 MiB
Ruby 63.9%
JavaScript 18.4%
TypeScript 8%
SCSS 4.8%
Haml 4.5%
Other 0.4%
5e11f3a6e1
Go to file
Claire 5e11f3a6e1 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/modal.scss`:
  For some reason we changed the file loading path in glitch-soc,
  but now upstream has completely changed how the logo is loaded.
  Applied upstream changes.
2021-02-12 10:28:32 +01: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-02-12 10:28:32 +01:00
bin fix: make Procfile compatible with herokuish (#12685) 2020-08-29 19:00:30 +02:00
chart Forward-port v3.2.2 changelog (#15370) 2020-12-19 03:13:50 +01:00
config Merge branch 'main' into glitch-soc/merge-upstream 2021-02-12 10:28:32 +01:00
db Merge branch 'master' into glitch-soc/merge-upstream 2020-12-19 00:55:12 +01:00
dist Set X-Forwarded-Proto to request scheme (#15310) (#15498) 2021-01-05 22:25:07 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2021-02-12 10:28:32 +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-12-15 14:27:06 +01:00
spec Merge branch 'main' into glitch-soc/merge-upstream 2021-02-12 10:28:32 +01:00
streaming Merge branch 'master' into glitch-soc/merge-upstream 2020-11-25 15:31:45 +01:00
vendor Increase files checked by ESLint (#9705) 2019-01-04 11:28:38 +01:00
.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 Fixed code quality issues (#15541) 2021-01-31 21:26:09 +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 Fix sample SAML_ACS_URL, SAML_ISSUER (#12669) 2019-12-23 18:12:22 +01:00
.env.production.sample Support customizing poll option limits 2021-01-26 14:07:31 +01:00
.env.test Bump webpacker from 4.0.7 to 4.2.0 (#12416) 2019-11-20 17:56:11 +01:00
.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 Enable promise/catch-or-return allowFinally (#14289) 2020-07-11 23:51:22 +02: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 Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191) 2020-07-01 19:05:21 +02: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 .nvmrc to Node.js 12 (#12906) 2020-01-21 12:42:13 +01: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 Fix rubocop config and warnings (#15503) 2021-01-07 09:40:55 +01:00
.ruby-version Use Ruby 2.7.2 (#15150) 2020-11-19 17:46:46 +01:00
.sass-lint.yml Fix sass-lint config (#10982) 2019-06-06 18:51:46 +02:00
.slugignore Remove Storybook (#4397) 2017-07-27 22:30:27 +02:00
.yarnclean Replace from scss-lint to sass-lint (#10958) 2019-06-04 17:23:18 +02:00
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 Remove unnecessary dependencies (#12533) 2019-12-02 13:38:53 +01:00
boxfile.yml Fix to isolate the sidekiq process that runs the scheduler job (#15314) 2020-12-15 03:04:03 +01:00
Capfile remove capistrano/faster_assets from Capfile (#2737) 2017-05-03 12:14:52 +02:00
CHANGELOG.md Bump version to 3.3.0 (#15433) 2020-12-27 06:00:55 +01:00
CODE_OF_CONDUCT.md Change e-mail contact for CoC enforcement 2019-06-06 17:42:07 +02: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 'main' into glitch-soc/merge-upstream 2021-01-26 14:01:30 +01:00
crowdin.yml Update Crowdin configuration file 2019-09-14 11:40:13 +02:00
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 Update to Node.js-12.20.1 (#15558) 2021-01-28 22:53:56 +01:00
Gemfile Merge branch 'main' into glitch-soc/merge-upstream 2021-02-12 10:28:32 +01:00
Gemfile.lock Merge branch 'main' into glitch-soc/merge-upstream 2021-02-12 10:28:32 +01:00
ide-helper.js Add JS IDE helper (#13012) 2020-04-27 17:19:53 +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 'main' into glitch-soc/merge-upstream 2021-02-12 10:28:32 +01: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 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 Initial commit 2016-02-20 22:53:20 +01:00
README.md 2019 -> 2020 (#12867) 2020-01-14 11:20:13 +01:00
scalingo.json Remove deprecated config from Heroku and Scalingo (#11925) 2019-09-23 12:11:59 +02:00
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-02-12 10:28:32 +01:00

README.md

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?