alex
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Alex Mastodon Fork
14,384 Commits
9 Branches
0 Tags
183 MiB
Ruby 42.3%
JavaScript 41.4%
SCSS 12%
Haml 4%
HTML 0.1%
 
 
 
 
 
Go to file
Claire 443ec4f8ba Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/tags/index.html.haml`:
  Removed upstream while it had changes in glitch-soc to accomodate for the
  theming system.

Additional changes to accomodate for the theming system:
- `app/views/admin/trends/links/preview_card_providers/index.html.haml`
- `app/views/admin/trends/links/index.html.haml`
- `app/views/admin/trends/tags/index.html.haml`
- `app/views/admin/tags/show.html.haml`
 		2021-11-25 23:50:35 +01:00
.circleci Ruby 3.0.2 Upgrade (#16982) 2021-11-18 21:59:57 +01:00
.github Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 18:42:18 +01:00
app Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00
bin Update Mastodon to Rails 6.1 (#15910) 2021-03-24 10:44:31 +01:00
chart Update Helm release elasticsearch to v15.10.3 (#16651) 2021-10-14 21:01:27 +02:00
config Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00
db Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00
dist templates/systemd/mastodon: update sandbox mode (#16235) 2021-10-25 16:31:20 +02:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00
log
…
nanobox
…
public Merge branch 'main' into glitch-soc/merge-upstream 2021-06-03 20:47:02 +02:00
spec Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00
streaming Merge branch 'main' into glitch-soc/merge-upstream 2021-10-13 15:50:24 +02:00
vendor
…
.buildpacks
…
.codeclimate.yml Exclude locale files from Code Climate (#16863) 2021-10-18 12:04:42 +02:00
.deepsource.toml Update .deepsource.toml (#15753) 2021-02-19 09:53:25 +01:00
.dockerignore Ignore git related files from docker build (#16282) 2021-05-22 17:43:07 +02:00
.editorconfig
…
.env.nanobox New env variable: CAS_SECURITY_ASSUME_EMAIL_IS_VERIFIED (#16655) 2021-08-25 18:41:24 +02:00
.env.production.sample Merge branch 'main' into glitch-soc/merge-upstream 2021-10-25 20:28:51 +02:00
.env.test
…
.env.vagrant
…
.eslintignore
…
.eslintrc.js
…
.foreman
…
.gitattributes
…
.gitignore helm: pin versions, commit lockfile (#15749) 2021-02-19 09:56:40 +01:00
.gitmodules
…
.haml-lint.yml
…
.nanoignore
…
.nvmrc NodeJS 14 support - circleci/docker/.nvmrc (#16163) 2021-08-10 22:56:13 +02:00
.profile
…
.rspec
…
.rubocop.yml Fix rubocop config and warnings (#15503) 2021-01-07 09:40:55 +01:00
.ruby-version Upgrade Ruby to 3.0.3 (#17038) 2021-11-24 20:29:05 +01:00
.sass-lint.yml
…
.slugignore
…
.yarnclean
…
AUTHORS.md Change references to tootsuite/mastodon to mastodon/mastodon (#16491) 2021-07-13 15:46:20 +02:00
Aptfile Use libvpx >= 5 (#15591) 2021-01-22 10:09:40 +01:00
CHANGELOG.md Forward port version bumps to 3.4.2 and 3.4.3 (#16945) 2021-11-06 05:32:14 +01:00
CODE_OF_CONDUCT.md
…
CONTRIBUTING.md Merge branch 'main' into glitch-soc/merge-upstream 2021-07-13 17:57:15 +02:00
Capfile
…
Dockerfile Upgrade Ruby to 3.0.3 (#17038) 2021-11-24 20:29:05 +01:00
FEDERATION.md Add FEDERATION.md (#17029) 2021-11-23 00:15:31 +01:00
Gemfile Merge branch 'main' into glitch-soc/merge-upstream 2021-11-19 18:51:41 +01:00
Gemfile.lock Merge branch 'main' into glitch-soc/merge-upstream 2021-11-19 18:51:41 +01:00
LICENSE
…
Procfile
…
Procfile.dev Set RAILS_ENV in Procfile.dev (#15502) 2021-01-07 09:30:12 +01:00
README.md add Vagrant short guide to readme (#13009) 2021-10-14 21:06:19 +02:00
Rakefile
…
SECURITY.md Fix security policy (#16248) 2021-05-16 23:50:16 +02:00
Vagrantfile Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 22:14:26 +02:00
app.json Change references to tootsuite/mastodon to mastodon/mastodon (#16491) 2021-07-13 15:46:20 +02:00
babel.config.js Remove dependency for @babel/plugin-proposal-class-properties (#16155) 2021-05-04 23:13:04 +02:00
boxfile.yml Fix to isolate the sidekiq process that runs the scheduler job (#15314) 2020-12-15 03:04:03 +01:00
config.ru
…
crowdin.yml
…
docker-compose.yml [Docker-Compose] [Breaking] Postgres 9.6 is EOL (11th Nov 2021) - Migrate to 14 Stable (#16947) 2021-11-18 22:00:27 +01:00
ide-helper.js
…
package.json Merge branch 'main' into glitch-soc/merge-upstream 2021-11-19 18:51:41 +01:00
postcss.config.js
…
priv-config
…
scalingo.json Change references to tootsuite/mastodon to mastodon/mastodon (#16491) 2021-07-13 15:46:20 +02:00
yarn.lock Merge branch 'main' into glitch-soc/merge-upstream 2021-11-19 18:51:41 +01:00

README.md

Mastodon Glitch Edition

Now with automated deploys!

Build Status Code Climate

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?