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 85933bc9ff
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
..
environments Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
initializers Fix ActiveRecord::Migration.check_pending! failing because of duplicate migrations 5 years ago
locales Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
webpack Revert CircleCI and some webpack changes to match upstream 5 years ago
application.rb Add kabyle language to Mastodon (#12962) 5 years ago
boot.rb Fix bootsnap cache directory being declared relatively (#9511) 6 years ago
brakeman.ignore Add type, limit, offset, min_id, max_id, account_id to search API (#10091) 6 years ago
database.yml config: add DB_SSLMODE for managed/remote PG (#10210) 6 years ago
deploy.rb Bump capistrano from 3.11.1 to 3.11.2 (#12012) 5 years ago
environment.rb Make PreviewCard records reuseable between statuses (#4642) 7 years ago
i18n-tasks.yml Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
navigation.rb Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
pghero.yml Use override_csp options on pghero (#12489) 5 years ago
puma.rb Add PERSISTENT_TIMEOUT option (#11756) 5 years ago
routes.rb Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
secrets.yml Upgrade to Rails 5.0.0.1 8 years ago
settings.yml Merge branch 'master' into glitch-soc/master 5 years ago
sidekiq.yml Change trending hashtags to not disappear instantly after midnight (#11712) 5 years ago
webpacker.yml Do not try to parse gif files as CSS or JS 6 years ago