.circleci
Restore support to ruby 2.3, add ruby 2.3 to circle ci ( #7935 )
2018-07-03 19:47:09 +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-07-11 17:57:08 +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-07-11 17:57:08 +02:00
db
Migrate glitch-soc keyword mutes to Mastodon's
2018-07-09 19:19:23 +02:00
docs
lib
Merge branch 'master' into glitch-soc/merge-upstream
2018-07-11 17:57:08 +02:00
log
nanobox
public
Merge branch 'master' into glitch-soc/tentative-merge
2018-07-09 07:13:59 +02:00
spec
Migrate glitch-soc keyword mutes to Mastodon's
2018-07-09 19:19:23 +02:00
streaming
Add media timeline ( #6631 )
2018-05-21 12:43:38 +02:00
vendor /assets
.babelrc
.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
.env.production.sample
Merge branch 'master' into glitch-soc/tentative-merge
2018-07-09 07:13:59 +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
.haml-lint.yml
.nanoignore
.nvmrc
.postcssrc.yml
.profile
.rspec
.rubocop.yml
fix RuboCop error ( #7442 )
2018-06-04 14:49:10 +02:00
.ruby-version
.scss-lint.yml
.slugignore
.travis.yml
Re-install test/dev dependencies before running tests
2018-07-09 19:19:23 +02:00
.yarnclean
app.json
Aptfile
AUTHORS.md
boxfile.yml
Capfile
CODE_OF_CONDUCT.md
config.ru
CONTRIBUTING.md
Merge remote-tracking branch 'origin/master' into gs-master
2018-05-04 12:16:12 -05:00
docker-compose.yml
Merge HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY
into ALLOW_ACCESS_TO_HIDDEN_SERVICE
( #7901 )
2018-06-29 15:36:02 +02:00
Dockerfile
Merge branch 'master' into glitch-soc/tentative-merge
2018-07-09 07:13:59 +02:00
Gemfile
Merge branch 'master' into glitch-soc/merge-upstream
2018-06-15 20:51:39 +02:00
Gemfile.lock
Merge branch 'master' into glitch-soc/merge-upstream
2018-06-21 20:49:57 +02:00
jest.config.js
LICENSE
package.json
Merge remote-tracking branch 'origin/master' into gs-master
2018-06-02 16:15:36 -05:00
priv-config
TOR federation ( #7875 )
2018-06-26 20:34:12 +02:00
Procfile
Procfile.dev
Rakefile
README.md
Remove reference to BTC, update video link
2018-07-05 21:02:21 +02:00
scalingo.json
Fix Unknown addon provider in scalingo.json ( #7928 )
2018-07-03 09:09:21 +02:00
stack-fix.c
Vagrantfile
yarn.lock
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-06-12 13:17:21 +00:00