alex
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Alex Mastodon Fork
7,186 Commits
9 Branches
0 Tags
183 MiB
Ruby 42.3%
JavaScript 41.4%
SCSS 12%
Haml 4%
HTML 0.1%
 
 
 
 
 
Go to file
Thibaut Girka 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/models/status.rb
	db/migrate/20180528141303_fix_accounts_unique_index.rb
	db/schema.rb

Resolved by taking upstream changes (no real conflicts, just glitch-soc
specific code too close to actual changes).
 		2018-08-17 17:43:54 +02:00
.circleci Use workspace instead of caching for built assets 2018-07-30 22:25:22 +02:00
.github Multiple Issue templates (#7402) 2018-05-08 13:35:33 +02:00
app Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00
bin Add symbolic link for yarnpkg (#7894) 2018-06-26 20:34:01 +02:00
config Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00
db Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00
docs
…
lib Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00
log
…
nanobox [Nanobox] Tuning Update (#6660) 2018-03-06 21:59:35 +01:00
public Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
spec Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00
streaming Fix streaming API still using filtered instead of chosen languages (#8009) 2018-07-14 03:59:31 +02:00
vendor/assets
…
.babelrc Remove debug option from Babel preset env (#6852) 2018-03-21 10:26:15 +01:00
.buildpacks
…
.codeclimate.yml fix RuboCop error (#7442) 2018-06-04 14:49:10 +02:00
.dockerignore Add .bundle to .dockerignore (#7895) 2018-06-26 20:33:29 +02:00
.editorconfig
…
.env.nanobox [Nanobox] Enable ElasticSearch support by default (#6977) 2018-03-31 13:17:25 +02:00
.env.production.sample Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00
.env.test Add parallel test processors (#7215) 2018-04-21 21:36:22 +02:00
.env.vagrant
…
.eslintignore
…
.eslintrc.yml Merge remote-tracking branch 'origin/master' into gs-master 2018-06-02 16:15:36 -05:00
.foreman
…
.gitattributes
…
.gitignore Ignore elasticsearch directory (#7070) 2018-04-08 16:57:16 +09:00
.gitmodules Rename themes -> flavours ? ? 2017-12-03 23:26:40 -08:00
.haml-lint.yml
…
.nanoignore
…
.nvmrc Upgrade Node.js to v8.x on nvmrc (#8023) 2018-07-15 12:29:17 +09:00
.postcssrc.yml
…
.profile
…
.rspec
…
.rubocop.yml Add post-deployment migration system (#8182) 2018-08-13 18:17:20 +02:00
.ruby-version Update Ruby to version 2.4.4 (#6964) 2018-04-01 23:43:08 +02:00
.scss-lint.yml
…
.slugignore
…
.yarnclean Reduce container size with clean yarn (#3506) 2017-09-30 22:05:24 +02:00
AUTHORS.md docs: Add AUTHORS file (#6685) 2018-03-09 13:11:43 +01:00
Aptfile Add dependencies for uWebSockets (#7466) 2018-07-14 01:47:10 +02:00
CODE_OF_CONDUCT.md update code of conduct email address 2017-11-21 11:01:28 -05:00
CONTRIBUTING.md Merge remote-tracking branch 'origin/master' into gs-master 2018-05-04 12:16:12 -05:00
Capfile
…
Dockerfile Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00
LICENSE
…
Procfile
…
Procfile.dev Fix Procfile on OS X (#6748) 2018-03-12 03:50:40 +01:00
README.md Remove reference to BTC, update video link 2018-07-05 21:02:21 +02:00
Rakefile
…
Vagrantfile Merge branch 'master' into glitch-soc/merge-upstream 2018-08-01 22:20:25 +02:00
app.json Change logo URL for Heroku and Scalingo (#4476) 2017-08-01 05:59:11 +02:00
boxfile.yml [Nanobox] Enable ElasticSearch support by default (#6977) 2018-03-31 13:17:25 +02:00
config.ru
…
docker-compose.yml Update docker-compose to cope with build-time assets (#8156) 2018-08-09 22:37:48 +02:00
jest.config.js Removed glitch tests 2017-11-17 19:29:17 -08:00
package.json Merge branch 'master' into glitch-soc/merge-upstream 2018-08-01 00:18:13 +02:00
priv-config TOR federation (#7875) 2018-06-26 20:34:12 +02:00
scalingo.json Fix Unknown addon provider in scalingo.json (#7928) 2018-07-03 09:09:21 +02:00
stack-fix.c dockerfile: Give more stack space to /sbin/tini. 2018-01-11 04:09:16 -06:00
yarn.lock Merge branch 'master' into glitch-soc/merge-upstream 2018-08-01 00:18:13 +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?