help me my masotodon ate a calckey and now it has reactions qts and stuff
Find a file
Thibaut Girka 249991c498 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- Gemfile.lock
- app/controllers/accounts_controller.rb
- app/controllers/admin/dashboard_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/following_accounts_controller.rb
- app/controllers/remote_follow_controller.rb
- app/controllers/stream_entries_controller.rb
- app/controllers/tags_controller.rb
- app/javascript/packs/public.js
- app/lib/sanitize_config.rb
- app/models/account.rb
- app/models/form/admin_settings.rb
- app/models/media_attachment.rb
- app/models/stream_entry.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/services/batched_remove_status_service.rb
- app/services/post_status_service.rb
- app/services/process_mentions_service.rb
- app/services/reblog_service.rb
- app/services/remove_status_service.rb
- app/views/admin/settings/edit.html.haml
- config/locales/simple_form.pl.yml
- config/settings.yml
- docker-compose.yml
2019-07-19 18:26:49 +02:00
.circleci Merge branch 'master' into glitch-soc/merge-upstream 2019-06-16 21:09:19 +02:00
.dependabot
.github Merge branch 'master' into glitch-soc/merge-upstream 2019-05-23 19:01:30 +02:00
app Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
bin
config Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
db Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
dist Cache error 410 responses in recommended nginx configuration (#10425) 2019-03-30 03:14:31 +01:00
lib When cleaning up remote statuses, keep bookmarked ones 2019-07-18 13:34:54 +02:00
log
nanobox Resync Nanobox files with the 2.9.0 release (#11083) 2019-06-14 14:52:31 +02:00
public
spec Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
streaming Change default interface of web and streaming from 0.0.0.0 to 127.0.0.1 (#11302) 2019-07-16 16:10:19 +02:00
vendor
.buildpacks Add ffmpeg buildpack for scalingo (#8500) 2018-08-29 01:21:23 +02:00
.codeclimate.yml
.dockerignore
.editorconfig
.env.nanobox
.env.production.sample Change .env.production.sample to specify that MAX_VIDEO_SIZE also applies to audio files 2019-06-24 16:27:10 +02:00
.env.test
.env.vagrant update vagrant configs (#8706) 2018-09-16 14:49:15 -04:00
.eslintignore
.eslintrc.js
.foreman
.gitattributes
.gitignore
.gitmodules
.haml-lint.yml
.nanoignore Remove Storybook (#4397) 2017-07-27 22:30:27 +02:00
.nvmrc
.profile Add ffmpeg and dependent packages as well as LD_LIBRARY_PATHs (#3276) 2017-05-24 17:57:33 +02:00
.rspec Adding a Mention model, test stubs 2016-02-25 00:17:01 +01:00
.rubocop.yml require rubocop-rails in .rubocop.yml (#10974) 2019-06-06 12:31:48 +02:00
.ruby-version Upgrade Ruby to 2.6.1 (#9956) 2019-02-20 11:57:08 +01:00
.sass-lint.yml Fix sass-lint config (#10982) 2019-06-06 18:51:46 +02:00
.slugignore
.yarnclean
app.json
Aptfile Adjust Aptfile for Heroku-18 stack (#8588) 2018-09-09 02:10:58 +02:00
AUTHORS.md Bump version to 2.8.0rc1 (#10340) 2019-03-30 02:13:42 +01:00
babel.config.js New Crowdin translations (#11077) 2019-06-18 22:58:18 +02:00
boxfile.yml Resync Nanobox files with the 2.9.0 release (#11083) 2019-06-14 14:52:31 +02:00
Capfile
CHANGELOG.md Fix unconverted PRs in the changelog (#11155) 2019-06-22 18:13:52 +02:00
CODE_OF_CONDUCT.md Change e-mail contact for CoC enforcement 2019-06-06 17:42:07 +02:00
config.ru Fix rubocop issues, introduce usage of frozen literal to improve performance 2016-11-15 16:56:29 +01:00
CONTRIBUTING.md Merge branch 'master' into glitch-soc/merge-upstream 2019-06-16 21:09:19 +02:00
crowdin.yml Update crowdin.yml 2019-06-12 15:11:00 +02:00
docker-compose.yml Change Dockerfile to bind to 0.0.0.0 instead of docker-compose.yml (#11351) 2019-07-18 20:28:05 +02:00
Dockerfile Change Dockerfile to bind to 0.0.0.0 instead of docker-compose.yml (#11351) 2019-07-18 20:28:05 +02:00
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
LICENSE
package.json Bump eslint-plugin-jsx-a11y from 6.2.1 to 6.2.3 (#11314) 2019-07-16 16:10:20 +02:00
postcss.config.js Increase files checked by ESLint (#9705) 2019-01-04 11:28:38 +01:00
priv-config
Procfile
Procfile.dev Fix Procfile on OS X (#6748) 2018-03-12 03:50:40 +01:00
Rakefile
README.md Fix build status link in README.md 2018-09-28 21:18:04 +02:00
scalingo.json
Vagrantfile
yarn.lock Bump eslint-plugin-jsx-a11y from 6.2.1 to 6.2.3 (#11314) 2019-07-16 16:10:20 +02:00

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?