|
.circleci
|
Update config.yml (#13379)
|
2020-04-04 15:52:42 +02:00 |
|
.dependabot
|
…
|
|
|
.github
|
…
|
|
|
app
|
Merge branch 'master' of https://github.com/glitch-soc/mastodon
|
2020-04-08 22:18:04 -05:00 |
|
bin
|
…
|
|
|
config
|
Merge branch 'master' of https://github.com/glitch-soc/mastodon
|
2020-04-08 22:18:04 -05:00 |
|
db
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2020-04-05 18:32:06 +02:00 |
|
dist
|
Update nginx.conf (#13066)
|
2020-03-08 16:04:25 +01:00 |
|
lib
|
+glitchcity version
|
2020-04-08 22:32:47 -05:00 |
|
log
|
…
|
|
|
nanobox
|
…
|
|
|
public
|
…
|
|
|
spec
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2020-04-04 21:47:37 +02:00 |
|
streaming
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2020-01-25 10:04:41 +01:00 |
|
vendor
|
…
|
|
|
.buildpacks
|
…
|
|
|
.codeclimate.yml
|
…
|
|
|
.dockerignore
|
…
|
|
|
.editorconfig
|
…
|
|
|
.env.nanobox
|
Fix sample SAML_ACS_URL, SAML_ISSUER (#12669)
|
2019-12-23 18:12:22 +01:00 |
|
.env.production.sample
|
Add environment variable to specify extra data hosts
|
2020-02-06 12:15:15 +01:00 |
|
.env.test
|
…
|
|
|
.env.vagrant
|
…
|
|
|
.eslintignore
|
…
|
|
|
.eslintrc.js
|
…
|
|
|
.foreman
|
…
|
|
|
.gitattributes
|
…
|
|
|
.gitignore
|
Merge branch 'master' of https://github.com/glitch-soc/mastodon
|
2020-02-19 00:20:30 -06: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
|
…
|
|
|
.ruby-version
|
Update .ruby-version (#13395)
|
2020-04-05 13:58:43 +02:00 |
|
.sass-lint.yml
|
…
|
|
|
.slugignore
|
…
|
|
|
.yarnclean
|
…
|
|
|
AUTHORS.md
|
…
|
|
|
Aptfile
|
…
|
|
|
CHANGELOG.md
|
Update CHANGELOG.md (#13397)
|
2020-04-05 15:18:41 +02:00 |
|
CODE_OF_CONDUCT.md
|
…
|
|
|
CONTRIBUTING.md
|
…
|
|
|
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-04-05 18:32:06 +02:00 |
|
Gemfile.lock
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2020-04-05 18:32:06 +02:00 |
|
LICENSE
|
…
|
|
|
Procfile
|
…
|
|
|
Procfile.dev
|
…
|
|
|
README.md
|
+glitchcity version
|
2020-04-08 22:32:47 -05:00 |
|
Rakefile
|
…
|
|
|
Vagrantfile
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2020-04-04 21:47:37 +02:00 |
|
app.json
|
…
|
|
|
babel.config.js
|
…
|
|
|
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
|
…
|
|
|
package.json
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2020-04-05 18:32:06 +02:00 |
|
postcss.config.js
|
…
|
|
|
priv-config
|
…
|
|
|
scalingo.json
|
…
|
|
|
yarn.lock
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2020-04-05 18:32:06 +02:00 |
Jay Logan
49987e75f8