luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-18 04:43:24 +00:00
Code Issues Projects Releases Wiki Activity
A glitchy but lovable microblogging server
10637 commits 1 branch 0 tags 248 MiB
Ruby 62.3%
JavaScript 24%
SCSS 6.9%
Haml 5%
TypeScript 1.5%
Other 0.2%
Go to file
Thibaut Girka 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
  conflicts caused by image URLs being different
- app/models/status.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
  some strings were changed upstream
- spec/models/status_spec.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline
2019-10-10 17:26:08 +02:00
.circleci Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00
.dependabot Change dependabot update schedule from live to weekly (#10949) 2019-06-04 11:23:19 +02:00
.github
app Merge branch 'master' into glitch-soc/merge-upstream 2019-10-10 17:26:08 +02:00
bin
config Merge branch 'master' into glitch-soc/merge-upstream 2019-10-10 17:26:08 +02:00
db Merge branch 'master' into glitch-soc/merge-upstream 2019-10-10 17:26:08 +02:00
dist Add TLS v1.3 support (#11603) 2019-08-30 07:42:50 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-10-10 17:26:08 +02:00
log
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 2019-08-19 21:49:35 +02:00
spec Merge branch 'master' into glitch-soc/merge-upstream 2019-10-10 17:26:08 +02:00
streaming Merge branch 'master' into glitch-soc/merge-upstream 2019-07-30 12:22:33 +02:00
vendor
.buildpacks
.codeclimate.yml Replace from scss-lint to sass-lint (#10958) 2019-06-04 17:23:18 +02:00
.dockerignore Add .bundle to .dockerignore (#7895) 2018-06-26 20:33:29 +02:00
.editorconfig
.env.nanobox Various updates for Nanobox deploys (#11988) 2019-10-02 00:25:25 +02:00
.env.production.sample Merge branch 'master' into glitch-soc/merge-upstream 2019-10-03 11:10:12 +02:00
.env.test
.env.vagrant
.eslintignore
.eslintrc.js
.foreman
.gitattributes
.gitignore
.gitmodules
.haml-lint.yml
.nanoignore
.nvmrc
.profile
.rspec
.rubocop.yml require rubocop-rails in .rubocop.yml (#10974) 2019-06-06 12:31:48 +02:00
.ruby-version Use Ruby 2.6.5 (#12049) 2019-10-02 04:54:32 +02:00
.sass-lint.yml Fix sass-lint config (#10982) 2019-06-06 18:51:46 +02:00
.slugignore
.yarnclean Replace from scss-lint to sass-lint (#10958) 2019-06-04 17:23:18 +02:00
app.json Remove deprecated config from Heroku and Scalingo (#11925) 2019-09-23 12:11:59 +02:00
Aptfile
AUTHORS.md Update AUTHORS.md (#12096) 2019-10-07 04:36:32 +02:00
babel.config.js Fix tesseract.js being part of the common chunk (#11571) 2019-08-15 17:24:45 +02:00
boxfile.yml Various updates for Nanobox deploys (#11988) 2019-10-02 00:25:25 +02:00
Capfile
CHANGELOG.md Update changelog for 3.0.1 (#12139) 2019-10-10 07:03:05 +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 Merge branch 'master' into glitch-soc/merge-upstream 2019-06-16 21:09:19 +02:00
crowdin.yml Update Crowdin configuration file 2019-09-14 11:40:13 +02:00
docker-compose.yml Add healthcheck endpoint for web (#11770) 2019-09-07 02:47:51 +02:00
Dockerfile Update nodejs in Dockerfile (#12052) 2019-10-02 17:28:31 +02:00
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2019-10-10 17:26:08 +02:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2019-10-10 17:26:08 +02:00
LICENSE
package.json Merge branch 'master' into glitch-soc/merge-upstream 2019-10-10 17:26:08 +02:00
postcss.config.js
priv-config
Procfile Bind servers to 0.0.0.0 in Procfile (#11378) 2019-07-22 06:16:30 +02:00
Procfile.dev
Rakefile
README.md Fix spelling error in README (#12086) 2019-10-06 21:36:26 +02:00
scalingo.json Remove deprecated config from Heroku and Scalingo (#11925) 2019-09-23 12:11:59 +02:00
Vagrantfile
yarn.lock Merge branch 'master' into glitch-soc/merge-upstream 2019-10-10 17:26:08 +02: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?