tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,031 Commits 10 Branches 0 Tags
f8d867bac43e7e18d293ac32a9be597d1f46dce3
T
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Claire f8d867bac4 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/remove_status_service.rb`:
  Conflict caused by us having a distinc Direct timeline.
  Ported upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
  Conflict between glitch-soc's variable character limit and upstream
  refactoring that part of the code.
  Ported upstream changes.
2020-12-05 17:33:37 +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 'master' into glitch-soc/merge-upstream
2020-12-05 17:33:37 +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-12-05 17:33:37 +01:00
db
Merge branch 'master' into glitch-soc/merge-upstream
2020-11-08 14:20:35 +01:00
dist
…
lib
Merge branch 'master' into glitch-soc/merge-upstream
2020-12-05 17:33:37 +01:00
log
…
nanobox
…
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-25 15:31:45 +01:00
streaming
Merge branch 'master' into glitch-soc/merge-upstream
2020-11-25 15:31:45 +01:00
vendor
…
.buildpacks
Remove nodejs buildpack from buildpacks (#14364)
2020-07-20 09:48:10 +02:00
.codeclimate.yml
Removed disabling comments for Style/MethodMissingSuper (#15014)
2020-10-20 09:13:39 +02:00
.dockerignore
…
.editorconfig
…
.env.nanobox
…
.env.production.sample
Merge branch 'master' into glitch-soc/merge-upstream
2020-07-15 15:32:40 +02:00
.env.test
…
.env.vagrant
…
.eslintignore
…
.eslintrc.js
Enable promise/catch-or-return allowFinally (#14289)
2020-07-11 23:51:22 +02:00
.foreman
…
.gitattributes
…
.gitignore
…
.gitmodules
…
.haml-lint.yml
…
.nanoignore
…
.nvmrc
…
.profile
…
.rspec
…
.rubocop.yml
Bump rubocop from 0.86.0 to 0.88.0 (#14412)
2020-09-01 03:04:00 +02:00
.ruby-version
Use Ruby 2.7.2 (#15150)
2020-11-19 17:46:46 +01:00
.sass-lint.yml
…
.slugignore
…
.yarnclean
…
app.json
Stop using heroku-buildpack-nodejs (#14341)
2020-07-16 22:01:34 +02:00
Aptfile
Stop installing libssl-dev for build (#14660)
2020-08-25 01:20:59 +02:00
AUTHORS.md
Update translators (#14374)
2020-07-22 23:08:27 +02:00
babel.config.js
…
boxfile.yml
…
Capfile
…
CHANGELOG.md
Fix changelog containing items from 3.2.1 twice (#15255)
2020-12-01 06:45:58 +01:00
CODE_OF_CONDUCT.md
…
config.ru
…
CONTRIBUTING.md
…
crowdin.yml
…
docker-compose.yml
…
Dockerfile
Update Dockerfile (#15232)
2020-11-29 09:20:02 +01:00
Gemfile
Merge branch 'master' into glitch-soc/merge-upstream
2020-12-05 17:33:37 +01:00
Gemfile.lock
Merge branch 'master' into glitch-soc/merge-upstream
2020-12-05 17:33:37 +01:00
ide-helper.js
…
LICENSE
…
package.json
Merge branch 'master' into glitch-soc/merge-upstream
2020-12-05 17:33:37 +01:00
postcss.config.js
…
priv-config
…
Procfile
fix: make Procfile compatible with herokuish (#12685)
2020-08-29 19:00:30 +02:00
Procfile.dev
…
Rakefile
…
README.md
…
scalingo.json
…
SECURITY.md
…
Vagrantfile
…
yarn.lock
Merge branch 'master' into glitch-soc/merge-upstream
2020-12-05 17:33:37 +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?

Reference in New Issue View Git Blame Copy Permalink
S
Description
Wobbl.xyz Mastodon Instance code
Readme 204 MiB
Languages
Ruby 57.6%
JavaScript 26.6%
SCSS 10%
Haml 5.5%
HTML 0.2%