|
.circleci
|
Set bundle config in local file, and set path (#14351)
|
2020-07-18 19:00:59 +02:00 |
|
.github
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2020-06-30 23:00:20 +02:00 |
|
app
|
Merge branch 'master' of https://github.com/glitch-soc/mastodon into master
|
2020-08-02 23:23:08 -05:00 |
|
bin
|
…
|
|
|
chart
|
helm: bump default image tag to v3.2.0 (#14476)
|
2020-08-02 11:20:31 +02:00 |
|
config
|
Merge branch 'master' of https://github.com/glitch-soc/mastodon into master
|
2020-08-02 23:23:08 -05:00 |
|
db
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2020-07-08 15:23:41 +02:00 |
|
dist
|
…
|
|
|
lib
|
Merge branch 'master' of https://github.com/glitch-soc/mastodon into master
|
2020-08-02 23:23:08 -05:00 |
|
log
|
…
|
|
|
nanobox
|
…
|
|
|
public
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2020-06-09 10:39:20 +02:00 |
|
spec
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2020-08-02 14:30:28 +02:00 |
|
streaming
|
Fix streaming server only working for streams allowing local-only toots
|
2020-07-07 20:31:45 +02:00 |
|
vendor
|
…
|
|
|
.buildpacks
|
Remove nodejs buildpack from buildpacks (#14364)
|
2020-07-20 09:48:10 +02:00 |
|
.codeclimate.yml
|
Bump eslint from 6.8.0 to 7.5.0 (#14454)
|
2020-07-29 04:52:35 +09:00 |
|
.dockerignore
|
…
|
|
|
.editorconfig
|
…
|
|
|
.env.nanobox
|
…
|
|
|
.env.production.sample
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2020-07-15 15:32:40 +02:00 |
|
.env.test
|
…
|
|
|
.env.vagrant
|
Add a default DB_HOST to .env.vagrant for enable the streaming (#14030)
|
2020-06-15 01:57:06 +02:00 |
|
.eslintignore
|
…
|
|
|
.eslintrc.js
|
Enable promise/catch-or-return allowFinally (#14289)
|
2020-07-11 23:51:22 +02:00 |
|
.foreman
|
…
|
|
|
.gitattributes
|
…
|
|
|
.gitignore
|
Merge branch 'master' of https://github.com/glitch-soc/mastodon into master
|
2020-08-02 23:23:08 -05:00 |
|
.gitmodules
|
…
|
|
|
.haml-lint.yml
|
…
|
|
|
.nanoignore
|
…
|
|
|
.nvmrc
|
…
|
|
|
.profile
|
…
|
|
|
.rspec
|
…
|
|
|
.rubocop.yml
|
Fix rubocop warning (#14288)
|
2020-07-14 19:05:07 +02:00 |
|
.ruby-version
|
…
|
|
|
.sass-lint.yml
|
…
|
|
|
.slugignore
|
…
|
|
|
.yarnclean
|
…
|
|
|
AUTHORS.md
|
Update translators (#14374)
|
2020-07-22 23:08:27 +02:00 |
|
Aptfile
|
…
|
|
|
CHANGELOG.md
|
Bump version to 3.2.0 (#14395)
|
2020-07-27 00:07:26 +02:00 |
|
CODE_OF_CONDUCT.md
|
…
|
|
|
CONTRIBUTING.md
|
…
|
|
|
Capfile
|
…
|
|
|
Dockerfile
|
Update Dockerfile (#13582)
|
2020-06-25 12:17:53 +02:00 |
|
Gemfile
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2020-08-01 20:24:23 +02:00 |
|
Gemfile.lock
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2020-08-01 20:24:23 +02:00 |
|
LICENSE
|
…
|
|
|
Procfile
|
…
|
|
|
Procfile.dev
|
…
|
|
|
README.md
|
…
|
|
|
Rakefile
|
…
|
|
|
SECURITY.md
|
Add Security Policy (#13946)
|
2020-06-03 08:32:23 +02:00 |
|
Vagrantfile
|
…
|
|
|
app.json
|
Stop using heroku-buildpack-nodejs (#14341)
|
2020-07-16 22:01:34 +02:00 |
|
babel.config.js
|
…
|
|
|
boxfile.yml
|
…
|
|
|
config.ru
|
…
|
|
|
crowdin.yml
|
…
|
|
|
docker-compose.yml
|
Update Elasticsearch from 6.1 to 6.8 in docker-compose.yml (Fix glitch-soc#1348) (#14016)
|
2020-06-10 13:57:30 +02:00 |
|
ide-helper.js
|
…
|
|
|
package.json
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2020-08-01 20:24:23 +02:00 |
|
postcss.config.js
|
…
|
|
|
priv-config
|
…
|
|
|
scalingo.json
|
…
|
|
|
yarn.lock
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2020-08-01 20:24:23 +02:00 |
Jay Logan
7459a86c95