treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
Treehouse Mastodon git tree
11,762 Commits
12 Branches
15 Tags
760 MiB
Ruby 48.7%
JavaScript 33.9%
SCSS 7.9%
TypeScript 5.6%
Haml 3.5%
Other 0.4%
 
 
 
 
 
 
Go to file
Thibaut Girka 4a70792b4a Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Not a real conflict, just a glitch-soc-only dependency too close to a
  dependency that got updated upstream. Updated as well.
- `app/models/status.rb`:
  Not a real conflict, just a change too close to glitch-soc-changed code
  for optionally showing boosts in public timelines.
  Applied upstream changes.
- `app/views/layouts/application.html.haml`:
  Upstream a new, static CSS file, conflict due to glitch-soc's theming
  system, include the file regardless of the theme.
- `config/initializers/content_security_policy.rb`:
  Upstream dropped 'unsafe-inline' from the 'style-src' directive, but
  both files are very different. Removed 'unsafe-inline' as well.
 		2020-05-10 16:19:56 +02:00
.circleci Fix the circleci packages for Buster. (#13583) 2020-05-01 23:45:40 +02:00
.dependabot Increase dependabot dependencies scope from security-only. (#13400) 2020-04-06 09:43:55 +02:00
.github Merge branch 'master' into glitch-soc/merge-upstream 2019-11-20 15:36:09 +01:00
app Merge branch 'master' into glitch-soc/merge-upstream 2020-05-10 16:19:56 +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 2020-05-10 16:19:56 +02:00
db Merge branch 'master' into glitch-soc/merge-upstream 2020-05-10 16:19:56 +02:00
dist Update nginx.conf (#13066) 2020-03-08 16:04:25 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-05-10 16:19:56 +02: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-05-10 16:19:56 +02:00
spec Merge branch 'master' into glitch-soc/merge-upstream 2020-05-10 16:19:56 +02:00
streaming Merge branch 'master' into glitch-soc/merge-upstream 2020-05-10 16:19:56 +02:00
vendor Increase files checked by ESLint (#9705) 2019-01-04 11:28:38 +01:00
.buildpacks
…
.codeclimate.yml Bump rubocop from 0.79.0 to 0.82.0 (#13677) 2020-05-08 20:24:26 +02:00
.dockerignore
…
.editorconfig
…
.env.nanobox Fix sample SAML_ACS_URL, SAML_ISSUER (#12669) 2019-12-23 18:12:22 +01:00
.env.production.sample Merge branch 'master' into glitch-soc/merge-upstream 2020-05-10 16:19:56 +02:00
.env.test Bump webpacker from 4.0.7 to 4.2.0 (#12416) 2019-11-20 17:56:11 +01:00
.env.vagrant fix vagrant connection error (#12180) 2019-10-24 22:47:24 +02: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
…
.gitattributes
…
.gitignore Add new vagrant log files to .gitignore (#13442) 2020-04-12 13:37:34 +02:00
.gitmodules
…
.haml-lint.yml
…
.nanoignore
…
.nvmrc Upgrade .nvmrc to Node.js 12 (#12906) 2020-01-21 12:42:13 +01:00
.profile
…
.rspec
…
.rubocop.yml Update ESLint and RuboCop in Code Climate (#12534) 2019-12-02 18:25:43 +01:00
.ruby-version Update .ruby-version (#13395) 2020-04-05 13:58:43 +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
AUTHORS.md Update AUTHORS.md (#12096) 2019-10-07 04:36:32 +02:00
Aptfile
…
CHANGELOG.md Update CHANGELOG.md (#13397) 2020-04-05 15:18:41 +02:00
CODE_OF_CONDUCT.md Change e-mail contact for CoC enforcement 2019-06-06 17:42:07 +02:00
CONTRIBUTING.md Merge branch 'master' into glitch-soc/merge-upstream 2019-11-20 15:36:09 +01:00
Capfile
…
Dockerfile [Security] Update Dockerfile for Ruby 2.6.6 (#13393) 2020-04-05 12:52:07 +02:00
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2020-05-10 16:19:56 +02:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2020-05-10 16:19:56 +02:00
LICENSE
…
Procfile Bind servers to 0.0.0.0 in Procfile (#11378) 2019-07-22 06:16:30 +02:00
Procfile.dev
…
README.md Fix translation platform to Crowdin (#13443) 2020-04-10 08:24:23 +02:00
Rakefile
…
Vagrantfile Merge branch 'master' into glitch-soc/merge-upstream 2020-04-04 21:47:37 +02:00
app.json Remove deprecated config from Heroku and Scalingo (#11925) 2019-09-23 12:11:59 +02:00
babel.config.js Remove unnecessary dependencies (#12533) 2019-12-02 13:38:53 +01:00
boxfile.yml Correct the Nanobox deploy hooks for order and context (#12663) 2019-12-22 08:55:27 +01:00
config.ru
…
crowdin.yml Update Crowdin configuration file 2019-09-14 11:40:13 +02:00
docker-compose.yml increase the postgres container shm_size from 64mb to 256mb (#13451) 2020-04-12 16:41:54 +02:00
ide-helper.js Add JS IDE helper (#13012) 2020-04-27 17:19:53 +02:00
package.json Merge branch 'master' into glitch-soc/merge-upstream 2020-05-10 16:19:56 +02:00
postcss.config.js Increase files checked by ESLint (#9705) 2019-01-04 11:28:38 +01:00
priv-config
…
scalingo.json Remove deprecated config from Heroku and Scalingo (#11925) 2019-09-23 12:11:59 +02:00
yarn.lock Merge branch 'master' into glitch-soc/merge-upstream 2020-05-10 16:19:56 +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?