.circleci
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-13 18:13:43 +02:00
.dependabot
Change dependabot update schedule from live to weekly ( #10949 )
2019-06-04 11:23:19 +02:00
.github
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-23 19:01:30 +02:00
app
Revert "Change unlisted custom emoji to not appear in autosuggestions ( #11818 )"
2019-10-10 03:18:42 +00:00
bin
…
config
Merge branch 'master' of https://github.com/glitch-soc/mastodon
2019-10-10 02:43:59 +00:00
db
Merge branch 'master' into glitch-soc/merge-upstream
2019-10-03 11:10:12 +02:00
dist
Add TLS v1.3 support ( #11603 )
2019-08-30 07:42:50 +02:00
lib
Merge tag 'v3.0.0' into glitch-soc/merge-upstream
2019-10-04 19:49:43 +02:00
log
…
nanobox
Resync Nanobox files with the 2.9.0 release ( #11083 )
2019-06-14 14:52:31 +02:00
public
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-19 21:49:35 +02:00
spec
Merge tag 'v3.0.0' into glitch-soc/merge-upstream
2019-10-04 19:49:43 +02:00
streaming
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-30 12:22:33 +02:00
vendor
…
.buildpacks
…
.codeclimate.yml
Replace from scss-lint to sass-lint ( #10958 )
2019-06-04 17:23:18 +02:00
.dockerignore
…
.editorconfig
…
.env.nanobox
Various updates for Nanobox deploys ( #11988 )
2019-10-02 00:25:25 +02:00
.env.production.sample
Merge branch 'master' into glitch-soc/merge-upstream
2019-10-03 11:10:12 +02:00
.env.test
…
.env.vagrant
…
.eslintignore
…
.eslintrc.js
…
.foreman
…
.gitattributes
…
.gitignore
Clacks addition. .gitignore domain blocks list
2019-06-26 04:49:36 +00:00
.gitmodules
…
.haml-lint.yml
…
.nanoignore
…
.nvmrc
…
.profile
…
.rspec
…
.rubocop.yml
require rubocop-rails in .rubocop.yml ( #10974 )
2019-06-06 12:31:48 +02:00
.ruby-version
Use Ruby 2.6.5 ( #12049 )
2019-10-02 04:54:32 +02:00
.sass-lint.yml
Fix sass-lint config ( #10982 )
2019-06-06 18:51:46 +02:00
.slugignore
…
.yarnclean
Replace from scss-lint to sass-lint ( #10958 )
2019-06-04 17:23:18 +02:00
AUTHORS.md
…
Aptfile
…
CHANGELOG.md
Bump version to 3.0.0 ( #12000 )
2019-10-03 22:44:22 +02:00
CODE_OF_CONDUCT.md
Change e-mail contact for CoC enforcement
2019-06-06 17:42:07 +02:00
CONTRIBUTING.md
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-16 21:09:19 +02:00
Capfile
…
Dockerfile
Update nodejs in Dockerfile ( #12052 )
2019-10-02 17:28:31 +02:00
Gemfile
Merge branch 'master' into glitch-soc/merge-upstream
2019-10-03 11:10:12 +02:00
Gemfile.lock
Merge tag 'v3.0.0' into glitch-soc/merge-upstream
2019-10-04 19:49:43 +02:00
LICENSE
…
Procfile
Bind servers to 0.0.0.0 in Procfile ( #11378 )
2019-07-22 06:16:30 +02:00
Procfile.dev
…
README.md
Change translations badge in README to Crowdin ( #11054 )
2019-06-12 15:56:41 +02:00
Rakefile
…
Vagrantfile
…
app.json
Remove deprecated config from Heroku and Scalingo ( #11925 )
2019-09-23 12:11:59 +02:00
babel.config.js
Fix tesseract.js being part of the common chunk ( #11571 )
2019-08-15 17:24:45 +02:00
boxfile.yml
Various updates for Nanobox deploys ( #11988 )
2019-10-02 00:25:25 +02:00
config.ru
…
crowdin.yml
Update Crowdin configuration file
2019-09-14 11:40:13 +02:00
docker-compose.yml
Add healthcheck endpoint for web ( #11770 )
2019-09-07 02:47:51 +02:00
package.json
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-30 12:23:57 +02:00
postcss.config.js
…
priv-config
…
scalingo.json
Remove deprecated config from Heroku and Scalingo ( #11925 )
2019-09-23 12:11:59 +02:00
yarn.lock
Merge branch 'master' into glitch-soc/merge-upstream
2019-10-03 11:10:12 +02:00
Jay Logan
e2c8c029db
