You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Thibaut Girka 122ac9cd1d
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
..
environments Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
initializers Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
locales Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
webpack Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
application.rb Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
boot.rb Lint pass (#8876) 6 years ago
brakeman.ignore Add animate custom emoji param to embed pages (#8507) 6 years ago
database.yml use-DB_NAME-in-development (#5430) 7 years ago
deploy.rb Update dependencies for Ruby (2018-04-23) (#7237) 7 years ago
environment.rb Make PreviewCard records reuseable between statuses (#4642) 7 years ago
i18n-tasks.yml Ignore tootsuite-specific theme-related translation strings 7 years ago
navigation.rb Revert Font Awesome 5 upgrade (#8810) 6 years ago
puma.rb lint pass 2 (#8878) 6 years ago
routes.rb Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
secrets.yml Upgrade to Rails 5.0.0.1 8 years ago
settings.yml Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
sidekiq.yml Add nginx and systemd templates (#8770) 6 years ago
webpacker.yml Fix building assets in test environment 6 years ago