Essem
ac7e36cdd3
Set oEmbed author to content when video is present
...
Discord won't show post content when a video is attached.
This essentially copies what FixTweet does to work around that.
2023-10-05 17:05:15 -05:00
gunchleoc
68ec1d180a
Fix language sorting in settings ( #27158 )
2023-10-04 09:23:50 +02:00
Matt Jankowski
e715da6d25
Fix haml-lint Rubocop Rails/*
cops ( #26042 )
2023-10-03 15:00:40 +02:00
gunchleoc
c85a1b83b3
Only strip country code when language not listed in SUPPORTED_LOCALES ( #27099 )
2023-09-28 11:49:27 -05:00
Matt Jankowski
340f1a68be
Simplify instance presenter view access ( #26046 )
2023-09-28 16:52:37 +02:00
Matt Jankowski
99e289f03f
Fix include Rails.application.routes.url_helpers
(Rails 7.1 prep) ( #27189 )
2023-09-28 16:52:11 +02:00
Matt Jankowski
e6b903b21e
Fix haml-lint InstanceVariables
rule for invites/_form ( #26064 )
2023-09-28 15:40:28 +02:00
gunchleoc
ce79caca4e
Only strip country code when language not listed in SUPPORTED_LOCALES ( #27099 )
2023-09-28 10:13:44 +02:00
Essem
8d776b9aa5
Merge remote-tracking branch 'upstream/main'
2023-09-26 20:03:35 -05:00
Claire
abdb58840a
Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream
2023-09-26 13:13:27 +02:00
Claire
39da3d86f8
Fix ActiveRecord using two connection pools when no replica is defined ( #27061 )
2023-09-22 16:01:59 +02:00
Essem
1007c16320
Merge remote-tracking branch 'upstream/main'
2023-09-19 10:05:45 -05:00
Claire
9688c5fcc4
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-18 12:09:37 +02:00
Claire
392c07f2bf
Fix Setting.authorized_fetch
not being properly taken into consideration ( #26958 )
2023-09-18 09:37:29 +02:00
Essem
4d9832b211
Merge remote-tracking branch 'upstream/main'
2023-09-07 08:52:29 -05:00
Claire
77caba3789
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-05 20:34:17 +02:00
Claire
ea7de25de0
Fix video player not being displayed in reports interface ( #26801 )
2023-09-05 20:05:58 +02:00
Essem
b871816f0e
Merge remote-tracking branch 'upstream/main'
2023-09-04 19:00:18 -05:00
Claire
e66f961e05
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-04 18:27:46 +02:00
gunchleoc
ac3f310f4b
Remove kmr from language selection ( #26014 )
2023-09-04 13:21:43 +02:00
Claire
4ed629cd7e
Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/form/admin_settings.rb`:
Upstream added the notion of overriden settings, while we had extra code for
pseudo-settings (only used to combine flavour and skin in a single select
field).
Ported upstream changes.
- `config/i18n-tasks.yml`:
Upstream added `simple_form.overridden` to `ignore_unused`,
we had `simple_form.glitch_only`.
Added `simple_form.glitch_only` as well.
2023-09-02 14:44:47 +02:00
Claire
9e26cd5503
Add authorized_fetch
server setting in addition to env var ( #25798 )
2023-09-01 15:41:10 +02:00
Essem
7f94e0a8a7
Merge remote-tracking branch 'upstream/main'
2023-08-27 00:23:51 -05:00
Claire
b6b68b44a1
Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream
...
Conflicts:
- `Vagrantfile`:
Upstream bumped a bunch of values, including one that was already bumped by
glitch-soc.
Took upstream's version.
- `lib/paperclip/transcoder.rb`:
glitch-soc already had a partial fix for this.
Took upstream's version.
2023-08-24 21:46:17 +02:00
Claire
d65aa507ca
Merge commit 'bd023a2637ce4df2102c4f760ca1d05ff2302d9f' into glitch-soc/merge-upstream
2023-08-24 21:38:59 +02:00
Essem
0451c28535
Merge remote-tracking branch 'upstream/main'
2023-08-24 13:51:53 -05:00
Robert R George
cf6f70799b
Add support for federating memorial
attribute ( #26583 )
2023-08-23 08:27:24 +02:00
Claire
2126812f65
Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
Upstream moved some settings, where glitch-soc has an extra setting.
Ported upstream changes, moving the same settings as them.
2023-08-22 18:31:28 +02:00
gunchleoc
25dc01660d
Add Kalmyk to languages dropdown ( #26013 )
2023-08-22 17:50:04 +02:00
gunchleoc
c01ecd0879
Add cherokee to languages dropdown ( #26012 )
2023-08-22 16:53:27 +02:00
Claire
90ec88d58b
Add support for indexable
attribute on remote actors ( #26485 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-08-14 18:54:51 +02:00
Essem
1ec905149e
Merge remote-tracking branch 'upstream/main'
2023-08-12 16:44:23 -05:00
Claire
44a5f1b64a
Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream regenerated this file, glitch-soc had a specific ignore.
- `README.md`:
Upstream updated its README, but glitch-soc has a completely different one.
Kept glitch-soc's README
2023-08-11 22:15:41 +02:00
Emelia Smith
e258b4cb64
Refactor: replace whitelist_mode mentions with limited_federation_mode ( #26252 )
2023-08-02 19:32:48 +02:00
Essem
d9ea6abec0
Merge remote-tracking branch 'upstream/main'
2023-07-31 12:24:48 -05:00
Claire
454d8567d4
Merge commit '1814990a3d117555153321216fa593e4d9e84de3' into glitch-soc/merge-upstream
2023-07-30 15:54:34 +02:00
Claire
993d0a9950
Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/account.rb`:
Upstream added new validations close to lines on which glitch-soc had
modified validations to handle custom limits set through environment
variables.
Ported upstream changes.
- `config/initializers/content_security_policy.rb`:
Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is
completely different.
Added `AZURE_ALIAS_HOST` to our version of the file.
2023-07-30 13:15:01 +02:00
gunchleoc
b0134db6ff
Allow filtering for Chinese languages ( #26066 )
2023-07-28 23:07:22 +02:00
Matt Jankowski
8ac5a93a7d
Reformat large hash in ContextHelper
module ( #26180 )
2023-07-26 09:46:11 +02:00
Misty De Méo
b848ba3867
Paperclip: add support for Azure blob storage ( #23607 )
2023-07-19 09:02:49 +02:00
Matt Jankowski
6edd404482
Cleanup unused portions of statuses/status partial ( #26045 )
2023-07-19 08:44:16 +02:00
Essem
e64c00ec84
Merge remote-tracking branch 'upstream/main'
2023-07-17 10:24:20 -05:00
Claire
c943f17b1b
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-17 12:52:15 +02:00
Eugen Rochko
26e522ac55
Fix not actually connecting to the configured replica ( #25977 )
2023-07-17 08:26:52 +02:00
Claire
25571b18ed
Merge commit '5a3f174d561cbdc79a597cd2b9502ed058d372da' into glitch-soc/merge-upstream
2023-07-13 14:22:20 +02:00
Claire
2d09653d50
Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/application_controller.rb:
Upstream added an `include` where we had an extra `include` due to
glitch-soc's theming system.
Added upstream's new `include`.
2023-07-13 13:35:15 +02:00
Claire
5a3f174d56
Fix follow link style in embeds ( #25965 )
2023-07-13 12:58:56 +02:00
Nick Schonning
1a6c2e450a
Update rubocop to v1.54.1 ( #25627 )
2023-07-13 11:11:55 +02:00
Eugen Rochko
fdc3ff7c2d
Change notifications API to use a replica ( #25874 )
2023-07-12 17:06:00 +02:00
Claire
075887e1d6
Merge commit 'ea10febd257b5b729a50aeb3218389763f5f4b97' into glitch-soc/merge-upstream
2023-07-12 15:44:33 +02:00