.circleci
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-28 08:37:49 +01:00
.github
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-22 17:51:38 +02:00
app
Merge pull request #794 from ThibG/glitch-soc/merge-upstream
2018-10-28 20:36:55 +01:00
bin
Upgrade Babel to version 7.0.0 ( #5925 )
2018-09-14 17:59:48 +02:00
config
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-28 08:37:49 +01:00
db
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-28 08:37:49 +01:00
dist
Add nginx and systemd templates ( #8770 )
2018-09-24 16:46:05 +02:00
lib
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-28 08:37:49 +01:00
log
…
nanobox
…
public
Merge branch 'master' into glitch-soc/tentative-merge
2018-07-09 07:13:59 +02:00
spec
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-22 17:51:38 +02:00
streaming
Fix crash when using UNIX socket ( #9036 )
2018-10-21 16:41:33 +02:00
vendor /assets
…
.buildpacks
Add ffmpeg buildpack for scalingo ( #8500 )
2018-08-29 01:21:23 +02:00
.codeclimate.yml
fix RuboCop error ( #7442 )
2018-06-04 14:49:10 +02:00
.dockerignore
Add .bundle to .dockerignore ( #7895 )
2018-06-26 20:33:29 +02:00
.editorconfig
…
.env.nanobox
Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. ( #8423 )
2018-08-25 13:27:08 +02:00
.env.production.sample
Merge branch 'master' into glitch-soc/merge-upstream
2018-08-26 14:23:24 +02:00
.env.test
Do not test PAM authentication by default ( #9027 )
2018-10-20 07:32:26 +02:00
.env.vagrant
update vagrant configs ( #8706 )
2018-09-16 14:49:15 -04:00
.eslintignore
…
.eslintrc.yml
Merge remote-tracking branch 'origin/master' into gs-master
2018-06-02 16:15:36 -05:00
.foreman
…
.gitattributes
…
.gitignore
…
.gitmodules
…
.haml-lint.yml
…
.nanoignore
…
.nvmrc
Upgrade Node.js to v8.x on nvmrc ( #8023 )
2018-07-15 12:29:17 +09:00
.postcssrc.yml
…
.profile
…
.rspec
…
.rubocop.yml
Move more tasks to tootctl ( #8675 )
2018-09-14 17:42:22 +02:00
.ruby-version
Use Ruby ==2.5.2== 2.5.3 ( #9003 )
2018-10-18 22:32:47 +02:00
.scss-lint.yml
…
.slugignore
…
.yarnclean
…
AUTHORS.md
Bump version to 2.6.0rc1 ( #9025 )
2018-10-21 00:49:36 +02:00
Aptfile
Adjust Aptfile for Heroku-18 stack ( #8588 )
2018-09-09 02:10:58 +02:00
CHANGELOG.md
Bump version to 2.6.0rc2 ( #9087 )
2018-10-25 04:42:25 +02:00
CODE_OF_CONDUCT.md
…
CONTRIBUTING.md
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-22 17:51:38 +02:00
Capfile
…
Dockerfile
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-23 17:15:57 +02:00
Gemfile
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-28 08:37:49 +01:00
Gemfile.lock
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-28 08:37:49 +01:00
LICENSE
…
Procfile
…
Procfile.dev
…
README.md
Improve README ( #9012 )
2018-10-19 18:49:35 +02:00
Rakefile
…
Vagrantfile
Merge branch 'master' into glitch-soc/merge-upstream
2018-09-19 21:46:01 +02:00
app.json
…
babel.config.js
Upgrade Babel to version 7.0.0 ( #5925 )
2018-09-14 17:59:48 +02:00
boxfile.yml
…
config.ru
…
docker-compose.yml
Persist volumes by default in docker-compose ( #9055 )
2018-10-23 00:08:25 +02:00
jest.config.js
…
package.json
Revert Font Awesome 5 upgrade ( #8810 )
2018-09-28 02:11:14 +02:00
priv-config
TOR federation ( #7875 )
2018-06-26 20:34:12 +02:00
scalingo.json
Add ffmpeg buildpack for scalingo ( #8500 )
2018-08-29 01:21:23 +02:00
stack-fix.c
…
yarn.lock
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-07 19:47:56 +02:00
7f22ed0fc9
