Jeremy Kescher
7d8714db81
Bump Catstodon revision to 1.0.8
2024-08-11 19:12:59 +02:00
Jeremy Kescher
4e0b287075
Bump Catstodon revision to 1.0.7
2024-08-05 21:46:46 +02:00
Jeremy Kescher
81609f09ba
Bump Catstodon revision to 1.0.6
2024-08-04 13:50:03 +02:00
Jeremy Kescher
dfb5ac3b98
Bump Catstodon revision to 1.0.5
2024-08-01 00:29:17 +02:00
Jeremy Kescher
f3a55891e0
Merge branch 'refs/heads/glitch' into develop
2024-08-01 00:27:00 +02:00
Claire
8dd671a977
Merge commit 'a50c8e951f03a8eb53957ad1c3703155b223ed24' into glitch-soc/merge-upstream
2024-07-31 18:16:01 +02:00
Jeremy Kescher
1145f232e8
Bump Catstodon revision to 1.0.4
2024-07-31 15:03:30 +02:00
Claire
4eab6aef95
Change User-Agent to use Mastodon as the product, and http.rb as platform details ( #31192 )
2024-07-30 21:40:42 +00:00
Jeremy Kescher
5b2f994ad4
Bump Catstodon revision to 1.0.3
2024-07-30 08:46:24 +02:00
Jeremy Kescher
dcb356d256
Bump Catstodon revision to 1.0.2
2024-07-19 18:27:48 +02:00
Jeremy Kescher
5ed78a1e90
Bump Catstodon revision to 1.0.1
2024-07-16 22:38:39 +02:00
Jeremy Kescher
245684be0f
Reset Catstodon revision to 1.0.0 for alpha.5 merge
2024-07-04 18:11:47 +02:00
Claire
e61a7794f8
Merge commit 'df9e26158d9787859b24bdc276af478abf05e1af' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Conflict because glitch-soc has a different list of allowed tags.
Added upstream's new allowed tags while keeping ours.
- `spec/requests/api/v1/timelines/public_spec.rb`:
Conflict because of glitch-soc's default settings.
Updated accordingly.
2024-07-04 17:12:14 +02:00
Claire
df9e26158d
Bump version to v4.3.0-alpha.5 ( #30920 )
2024-07-04 14:59:54 +00:00
Jeremy Kescher
a2b0c0f69a
Bump Catstodon revision to 1.1.3
2024-07-02 19:33:15 +02:00
Jeremy Kescher
fbf9a61c55
Bump Catstodon revision to 1.1.2
2024-06-22 13:34:56 +02:00
Jeremy Kescher
f883c171fb
Bump Catstodon revision to 1.1.1
2024-06-19 17:56:52 +02:00
Jeremy Kescher
d220eaab0a
Bump Catstodon revision to 1.1.0
2024-06-18 01:17:19 +02:00
Jeremy Kescher
29ac8c0606
Merge branch 'refs/heads/glitch-soc' into develop
2024-06-18 00:15:52 +02:00
Jeremy Kescher
463585fc3c
Bump Catstodon revision to 1.0.3
2024-06-17 22:55:11 +02:00
Claire
395b9011ee
Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Not a real conflict, just upstream adding a method textually adjacent to
glitch-soc only code.
Ported upstream's change.
2024-06-17 18:30:28 +02:00
Michael Stanclift
d5f02adad7
Add option to use native Ruby driver for Redis ( #30717 )
2024-06-17 12:28:01 +00:00
Jeremy Kescher
b8c60aa810
Bump catstodon rev to 1.0.2
2024-06-16 05:41:46 +02:00
Jeremy Kescher
209f90f670
Merge branch 'refs/heads/glitch-soc' into develop
2024-06-16 05:32:45 +02:00
Claire
7277d2f130
Merge commit '496c10542bd39ca86a85d4de81778c134ea4383c' into glitch-soc/merge-upstream
2024-06-07 20:30:51 +02:00
Matt Jankowski
37e4d96b70
Restore verbose option to media remove cli ( #30536 )
2024-06-07 12:39:53 +00:00
Jeremy Kescher
3157f2d48a
Fix sign-in issues, bump version
2024-05-31 22:30:42 +02:00
Jeremy Kescher
cb080ca3ef
Bump version to v4.3.0-alpha.4+glitch+cat+1.0.0
2024-05-30 18:51:42 +02:00
Claire
b8271f20c5
Merge commit '7f808ff6e9148f1cfe1e16d000e2405b6e31f243' into glitch-soc/merge-upstream
2024-05-30 15:41:31 +02:00
Claire
7f808ff6e9
Bump version to v4.3.0-alpha.4 ( #30482 )
2024-05-30 13:34:46 +00:00
Claire
c827a98f19
Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Not a real conflict, just a line adjacent to a glitch-soc only dependency
getting updated.
Updated dependencies as upstream did.
2024-05-29 17:03:24 +02:00
Jeremy Kescher
3aa76c7383
Bump version to v4.3.0-alpha.3+glitch+cat+1.2.7
2024-05-29 14:25:32 +02:00
Claire
5d7d23999c
Fix leaking Elasticsearch connections in Sidekiq processes ( #30450 )
2024-05-29 08:15:06 +00:00
Jeremy Kescher
c1054880a3
Bump version to v4.3.0-alpha.3+glitch+cat+1.2.6
2024-05-22 23:58:09 +02:00
Jeremy Kescher
6703af29e3
Bump version to v4.3.0-alpha.3+glitch+cat+1.2.5
2024-05-21 05:52:53 +02:00
Jeremy Kescher
c9fb54fd4c
Emergency fix for charlock_holmes after ICU 75
2024-05-21 03:37:40 +02:00
Jeremy Kescher
ec9b8d058a
Bump version to v4.3.0-alpha.3+glitch+cat+1.2.3
2024-05-21 00:05:46 +02:00
Jeremy Kescher
fae98d1deb
Merge branch 'refs/heads/glitch-soc' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/initial_state.js
# app/javascript/mastodon/initial_state.js
2024-05-20 23:57:04 +02:00
Claire
e46321e63d
Merge commit 'de4815afda0809bf999519aabda1cd14c67278da' into glitch-soc/merge-upstream
2024-05-20 12:17:36 +02:00
Matt Jankowski
def6b686ff
Fix Rails/WhereRange cop ( #30343 )
2024-05-20 09:37:36 +00:00
Jeremy Kescher
16a89487fd
Bump version to v4.3.0-alpha.3+glitch+cat+1.2.2
2024-05-17 15:35:29 +02:00
Jeremy Kescher
70c76a1f30
Merge branch 'refs/heads/glitch-soc' into develop
2024-05-17 15:33:30 +02:00
Claire
2810231180
Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
Upstream renamed a helper method everywhere.
There was one glitch-soc line involving changes because of the local-only post
feature.
Ported upstream's change.
2024-05-16 19:30:10 +02:00
Claire
c2ca3d152f
Fix off-by-one in tootctl media commands ( #30306 )
2024-05-15 13:11:13 +00:00
Jeremy Kescher
40bfe6a99c
Bump version to v4.3.0-alpha.3+glitch+cat+1.2.1
2024-05-14 18:56:58 +02:00
Jeremy Kescher
360fa71778
v4.3.0-alpha.3+glitch+cat+1.2.0
2024-05-11 23:36:59 +02:00
Jeremy Kescher
e73c612cb1
Merge branch 'refs/heads/glitch-soc' into develop
2024-05-11 23:31:31 +02:00
Claire
f09f5b35f2
Merge commit 'd97d31cce664281d868e4c661451687a301c97c8' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/account.rb`:
Upstream refactored this file a bit, moving validation limits to constants.
We already had a similar change, although with different constant names.
Updated to match upstream's code.
The following files were also modified accordingly:
- `app/views/settings/profiles/show.html.haml`
- `spec/requests/api/v1/accounts/credentials_spec.rb`
2024-05-04 16:12:51 +02:00
Claire
360590ecd8
Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/accounts_controller.rb`:
Conflict due to glitch-soc's local-only posting feature.
Refactored as upstream did but kept local changes.
- `app/lib/account_statuses_filter.rb`:
Conflict due to glitch-soc's local-only posting feature.
Refactored as upstream did but kept local changes.
2024-05-01 19:30:41 +02:00
Claire
9ce82a35cb
Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream
2024-05-01 18:42:26 +02:00
