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
61631f4751
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
conflicts caused by image URLs being different
- app/models/status.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
some strings were changed upstream
- spec/models/status_spec.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
|
2019-10-10 17:26:08 +02: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-10 17:26:08 +02: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
|
…
|
|
|
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-10 17:26:08 +02: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 |