This repository has been archived on 2024-07-22 . You can view files and clone it, but cannot push or open issues or pull requests.
Thibaut Girka
41a98b6543
Merge branch 'master' into glitch-soc/merge-upstream ...
Conflicts:
- README.md
- app/helpers/statuses_helper.rb
Upstream moved account helpers to their own file, we had extra
helpers there, moved too.
- app/lib/sanitize_config.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- config/locales/simple_form.en.yml
- spec/lib/sanitize_config_spec.rb
2019-10-27 12:14:01 +01:00
..
environments
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-05 11:36:41 +02:00
initializers
Merge branch 'master' into glitch-soc/merge-upstream
2019-10-10 17:26:08 +02:00
locales
Merge branch 'master' into glitch-soc/merge-upstream
2019-10-27 12:14:01 +01:00
webpack
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-19 21:49:35 +02:00
application.rb
Add br, es-AR, et, mk, nn to available locales ( #12062 )
2019-10-03 03:59:43 +02:00
boot.rb
Fix bootsnap cache directory being declared relatively ( #9511 )
2018-12-13 05:19:52 +01:00
brakeman.ignore
Add type, limit, offset, min_id, max_id, account_id to search API ( #10091 )
2019-02-26 15:21:36 +01:00
database.yml
config: add DB_SSLMODE for managed/remote PG ( #10210 )
2019-03-08 14:36:28 +01:00
deploy.rb
Bump capistrano from 3.11.1 to 3.11.2 ( #12012 )
2019-10-04 11:11:36 +09:00
environment.rb
…
i18n-tasks.yml
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-10 18:59:53 +02:00
navigation.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-30 12:23:57 +02:00
puma.rb
Add PERSISTENT_TIMEOUT option ( #11756 )
2019-09-04 20:44:08 +02:00
routes.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-30 12:23:57 +02:00
secrets.yml
…
settings.yml
Merge branch 'master' into glitch-soc/merge-upstream
2019-10-27 12:14:01 +01:00
sidekiq.yml
Change trending hashtags to not disappear instantly after midnight ( #11712 )
2019-09-02 18:11:13 +02:00
webpacker.yml
Do not try to parse gif files as CSS or JS
2019-03-16 14:23:50 +01:00
41a98b6543