Jeremy Kescher
197a51ec07
Bump version to v4.1.2+1.0.1
2023-04-12 23:10:12 +02:00
Jeremy Kescher
1e866e57ac
Merge remote-tracking branch 'upstream/main' into develop
2023-04-10 08:14:20 +02:00
Claire
ce12934f5b
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream removed a dependency that was textually close to a glitch-soc-only
dependency.
Removed the dependency as upstream did, while keeping the glitch-soc-only
dependency.
2023-04-09 11:45:08 +02:00
Jeremy Kescher
042671da67
Bump version to 4.1.1+1.0.7
2023-04-08 12:22:26 +02:00
Jeremy Kescher
cbd22f414a
Merge remote-tracking branch 'upstream/main' into develop
2023-04-07 23:19:47 +02:00
Claire
3d8bd093b9
Bump version to v4.1.2 ( #24427 )
2023-04-07 09:01:57 +02:00
Jeremy Kescher
198d0b2ed4
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# Gemfile.lock
2023-04-04 15:26:23 +02:00
Jeremy Kescher
9c4e0606d1
Fix appearance/show.html.haml
2023-04-03 22:43:14 +02:00
Jeremy Kescher
e4c411ef1a
Migrate emoji reactions
2023-04-03 22:21:54 +02:00
Jeremy Kescher
20d2a1938c
Bump Ruby version to 3.2.2 due to ReDOS vulnerabilities
2023-03-31 21:18:12 +02:00
Jeremy Kescher
722b6697d7
Merge remote-tracking branch 'upstream/main' into develop
2023-03-28 17:31:34 +02:00
Jeremy Kescher
276e958dae
Reset suffix_version to 1.0.0
2023-03-23 11:19:09 +01:00
Jeremy Kescher
4ec0bd126b
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
2023-03-23 11:18:01 +01:00
Claire
5ac380c122
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/status.rb`:
Upstream added lines close to a glitch-soc only line, not a real conflict.
Applied upstream's changes (added hooks) while keeping glitch-soc's changes
(`local_only` scope).
- `config/environments/production.rb`:
Upstream removed a header, while we have glitch-soc specific ones.
Removed the header removed upstream.
2023-03-22 19:50:11 +01:00
Claire
7f8e1bede4
Bump version to v4.1.1 ( #24201 )
2023-03-21 15:04:21 +01:00
Jeremy Kescher
60298487f1
Bump Catstodon version
2023-03-20 23:23:17 +01:00
Jeremy Kescher
2cb88f5baa
Merge remote-tracking branch 'upstream/main' into develop
...
Conflicts:
- .github/workflows/build-image.yml
We don't use GitHub Actions for building Docker images.
- Gemfile.lock
Versions were upgraded upstream that conflicted with our changes, simply applied upstream changes.
2023-03-19 01:57:28 +01:00
Jeremy Kescher
255ea1c131
v4.1.0+2.0.5
2023-03-17 13:01:21 +01:00
Jeremy Kescher
24e9a23fe6
Merge remote-tracking branch 'upstream/main' into develop, bump version
...
Conflicts:
- .github/workflows/build-image.yml
We're not building an image with GitHub Actions.
2023-03-17 07:27:28 +01:00
Jeremy Kescher
ddc4022845
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# Gemfile.lock
# app/javascript/flavours/glitch/initial_state.js
# app/javascript/mastodon/initial_state.js
# app/lib/feed_manager.rb
# app/services/batched_remove_status_service.rb
# lib/mastodon/feeds_cli.rb
2023-03-15 14:13:29 +01:00
Jeremy Kescher
3158b0ac17
v4.1.0+2.0.2
2023-03-06 16:35:23 +01:00
Jeremy Kescher
a79405d877
v4.1.0+2.0.1
2023-03-05 12:37:14 +01:00
Jeremy Kescher
88d22463d9
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# Gemfile
# Gemfile.lock
# config/sidekiq.yml
2023-02-21 00:53:40 +01:00
Jeremy Kescher
4a6cc45f9d
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# Gemfile
# Gemfile.lock
# config/sidekiq.yml
2023-02-18 22:38:53 +01:00
Jeremy Kescher
6ef68d4106
Update and fix dependencies
2023-02-17 00:29:06 +01:00
Claire
87419f9307
Merge branch 'main' into glitch-soc/merge-upstream
2023-02-10 22:49:59 +01:00
Claire
70c0d754a6
Bump version to 4.1.0 ( #23471 )
...
* Bump version to 4.1.0
* Editorialize changelog some more and highlight API changes
* Update changelog
2023-02-10 22:21:23 +01:00
Claire
aeacebb3d7
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream updated `docker/build-push-action`, and we a different config
for `docker/metadata-action` so the lines directly above were different,
but it's not a real conflict.
Upgraded `docker/build-push-action` as upstream did.
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
Upstream changed the codestyle near a line we had modified to accommodate
configurable character count.
Kept our change.
2023-02-03 19:23:27 +01:00
Claire
79ca19e9b2
Bump version to 4.1.0rc3 ( #23384 )
2023-02-03 16:39:38 +01:00
Jeremy Kescher
27fdb81b65
Merge remote-tracking branch 'upstream/main' into develop
2023-01-27 00:36:49 +01:00
Jeremy Kescher
855b0d4dbb
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
# lib/mastodon/version.rb
2023-01-26 17:27:01 +01:00
Claire
0f4637981b
Merge branch 'main' into glitch-soc/merge-upstream
2023-01-25 17:26:38 +01:00
Claire
2f112432e6
Bump version to 4.1.0rc2 ( #23220 )
2023-01-25 16:20:54 +01:00
Jeremy Kescher
44e4991a07
PgHero CVE fix
...
Backport of 9b795a25cd
2023-01-23 08:29:54 +01:00
Jeremy Kescher
a48a289df7
v4.0.2+1.1.6
2023-01-22 11:34:39 +01:00
Jeremy Kescher
bd30ddd982
Merge remote-tracking branch 'upstream/main' into develop
2023-01-22 11:33:25 +01:00
Claire
3fd3e88b25
Merge branch 'main' into glitch-soc/merge-upstream
2023-01-21 14:58:15 +01:00
Claire
8180f7ba19
Bump version to 4.1.0rc1 ( #23112 )
2023-01-20 14:19:12 +01:00
Jeremy Kescher
bf5076e970
Update a few gems
2023-01-18 22:33:07 +01:00
Jeremy Kescher
004b2fc290
Merge remote-tracking branch 'upstream/main' into develop
2023-01-15 20:38:42 +01:00
Jeremy Kescher
18cbce92f8
v4.0.2+1.1.3
2023-01-11 23:52:03 +01:00
Jeremy Kescher
0dfa8d73d7
v4.0.2+1.1.12
2023-01-05 23:30:18 +01:00
Jeremy Kescher
eded36676f
Fix status reactions preventing an on_cascade delete
2022-12-18 04:20:05 +01:00
Jeremy Kescher
0406f173cf
Merge remote-tracking branch 'reactions/main' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/locales/de.js
2022-12-17 11:09:32 +01:00
Jeremy Kescher
a1a1d08890
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
# Gemfile.lock
2022-12-16 17:53:33 +01:00
Jeremy Kescher
3e17e5b2cb
Merge remote-tracking branch 'upstream/main' into develop
2022-12-09 23:46:41 +01:00
Jeremy Kescher
7e19321520
Merge remote-tracking branch 'upstream/main' into develop
2022-12-07 17:49:14 +01:00
Jeremy Kescher
3520ebbd3b
v4.0.2+1.0.10
2022-12-04 21:52:49 +01:00
Jeremy Kescher
9554a005cd
v4.0.2+1.0.9
2022-12-04 20:58:04 +01:00
Jeremy Kescher
32600375b3
Merge remote-tracking branch 'upstream/main' into develop
2022-12-01 20:57:06 +01:00
