|
.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' of https://github.com/glitch-soc/mastodon
|
2020-05-14 17:49:16 -05:00 |
|
bin
|
…
|
|
|
config
|
Merge branch 'master' of https://github.com/glitch-soc/mastodon
|
2020-05-14 17:49:16 -05:00 |
|
db
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2020-05-13 22:11:49 +02:00 |
|
dist
|
Update nginx.conf (#13066)
|
2020-03-08 16:04:25 +01:00 |
|
lib
|
Merge branch 'master' of https://github.com/glitch-soc/mastodon
|
2020-05-14 17:49:16 -05:00 |
|
log
|
…
|
|
|
nanobox
|
…
|
|
|
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-13 22:11:49 +02:00 |
|
streaming
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2020-05-10 16:19:56 +02:00 |
|
vendor
|
…
|
|
|
.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
|
…
|
|
|
.eslintignore
|
…
|
|
|
.eslintrc.js
|
…
|
|
|
.foreman
|
…
|
|
|
.gitattributes
|
…
|
|
|
.gitignore
|
Merge branch 'master' of https://github.com/glitch-soc/mastodon
|
2020-05-14 17:49:16 -05: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
|
fix rubocop errors (#13690)
|
2020-05-10 16:42:48 +02:00 |
|
.ruby-version
|
Update .ruby-version (#13395)
|
2020-04-05 13:58:43 +02:00 |
|
.sass-lint.yml
|
…
|
|
|
.slugignore
|
…
|
|
|
.yarnclean
|
…
|
|
|
AUTHORS.md
|
…
|
|
|
Aptfile
|
…
|
|
|
CHANGELOG.md
|
Bump version to 3.1.4 (#13750)
|
2020-05-14 07:46:11 +02:00 |
|
CODE_OF_CONDUCT.md
|
…
|
|
|
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-13 22:11:49 +02:00 |
|
Gemfile.lock
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2020-05-13 22:11:49 +02:00 |
|
LICENSE
|
…
|
|
|
Procfile
|
…
|
|
|
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
|
…
|
|
|
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
|
…
|
|
|
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-13 22:11:49 +02:00 |
|
postcss.config.js
|
…
|
|
|
priv-config
|
…
|
|
|
scalingo.json
|
…
|
|
|
yarn.lock
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2020-05-13 22:11:49 +02:00 |
Jay Logan
721e05a3af