|
.circleci
|
…
|
|
|
.github
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2020-11-20 13:27:48 +01:00 |
|
app
|
Merge branch 'master' of https://github.com/glitch-soc/mastodon
|
2021-01-07 18:49:51 -06:00 |
|
bin
|
…
|
|
|
chart
|
Forward-port v3.2.2 changelog (#15370)
|
2020-12-19 03:13:50 +01:00 |
|
config
|
Merge branch 'master' of https://github.com/glitch-soc/mastodon
|
2021-01-07 18:49:51 -06:00 |
|
db
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2020-12-19 00:55:12 +01:00 |
|
dist
|
Set X-Forwarded-Proto to request scheme (#15310) (#15498)
|
2021-01-05 22:25:07 +01:00 |
|
lib
|
Merge branch 'master' of https://github.com/glitch-soc/mastodon
|
2021-01-07 18:49:51 -06:00 |
|
log
|
…
|
|
|
nanobox
|
…
|
|
|
public
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2020-12-15 14:27:06 +01:00 |
|
spec
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2021-01-06 18:08:06 +01:00 |
|
streaming
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2020-11-25 15:31:45 +01:00 |
|
vendor
|
…
|
|
|
.buildpacks
|
…
|
|
|
.codeclimate.yml
|
update codeclimate-rubocop (#15500)
|
2021-01-06 07:49:48 +01:00 |
|
.dockerignore
|
…
|
|
|
.editorconfig
|
…
|
|
|
.env.nanobox
|
…
|
|
|
.env.production.sample
|
…
|
|
|
.env.test
|
…
|
|
|
.env.vagrant
|
…
|
|
|
.eslintignore
|
…
|
|
|
.eslintrc.js
|
…
|
|
|
.foreman
|
…
|
|
|
.gitattributes
|
…
|
|
|
.gitignore
|
…
|
|
|
.gitmodules
|
…
|
|
|
.haml-lint.yml
|
…
|
|
|
.nanoignore
|
…
|
|
|
.nvmrc
|
…
|
|
|
.profile
|
…
|
|
|
.rspec
|
…
|
|
|
.rubocop.yml
|
…
|
|
|
.ruby-version
|
Use Ruby 2.7.2 (#15150)
|
2020-11-19 17:46:46 +01:00 |
|
.sass-lint.yml
|
…
|
|
|
.slugignore
|
…
|
|
|
.yarnclean
|
…
|
|
|
AUTHORS.md
|
Bump version to 3.3.0 (#15433)
|
2020-12-27 06:00:55 +01:00 |
|
Aptfile
|
…
|
|
|
CHANGELOG.md
|
Bump version to 3.3.0 (#15433)
|
2020-12-27 06:00:55 +01:00 |
|
CODE_OF_CONDUCT.md
|
…
|
|
|
CONTRIBUTING.md
|
…
|
|
|
Capfile
|
…
|
|
|
Dockerfile
|
Update Dockerfile (#15232)
|
2020-11-29 09:20:02 +01:00 |
|
Gemfile
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2021-01-06 18:08:06 +01:00 |
|
Gemfile.lock
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2021-01-06 18:08:06 +01:00 |
|
LICENSE
|
…
|
|
|
Procfile
|
…
|
|
|
Procfile.dev
|
…
|
|
|
README.md
|
…
|
|
|
Rakefile
|
…
|
|
|
SECURITY.md
|
…
|
|
|
Vagrantfile
|
…
|
|
|
app.json
|
…
|
|
|
babel.config.js
|
…
|
|
|
boxfile.yml
|
Fix to isolate the sidekiq process that runs the scheduler job (#15314)
|
2020-12-15 03:04:03 +01:00 |
|
config.ru
|
…
|
|
|
crowdin.yml
|
…
|
|
|
docker-compose.yml
|
…
|
|
|
ide-helper.js
|
…
|
|
|
package.json
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2021-01-06 18:08:06 +01:00 |
|
postcss.config.js
|
…
|
|
|
priv-config
|
…
|
|
|
scalingo.json
|
…
|
|
|
yarn.lock
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2021-01-06 18:08:06 +01:00 |
