mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2025-01-22 10:44:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
21246 commits 2 branches 270 tags 226 MiB
Commit graph

445 commits

Author SHA1 Message Date
Claire
51768de16e
Bump version to v4.1.6 (#26272) 2023-07-31 21:11:25 +02:00
Claire
b2515feb29 Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream 2023-07-30 14:33:28 +02:00
Claire
f2c683336b
Bump version to v4.1.5 (#26108) 2023-07-21 21:23:14 +02:00
fef
d6845d08d7
bump to nyastodon 1.2.2 2023-07-10 20:31:59 +00:00
fef
b4e8f17031
bump to nyastodon 1.2.1 2023-07-09 23:23:27 +00:00
fef
ddbdcaf0f8
bump to nyastodon 1.2.0 2023-07-09 23:16:10 +00:00
fef
0fbd6c586a
merge with catstodon/main 2023-07-09 22:30:50 +00:00
Jeremy Kescher
037fcd9d31
Merge branch 'glitch-soc' into develop 2023-07-07 22:05:28 +02:00
Claire
b9aa228c54 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream attempted something with tags.
  Kept our version.
 2023-07-07 19:59:43 +02:00
Claire
0051128387
Bump version to v4.1.4 (#25805) 2023-07-07 19:42:03 +02:00
fef
f3932cf879
bump to nyastodon 1.1.11 2023-07-07 02:29:10 +00:00
fef
6b7b0d5b15
merge with catcatnya/main 2023-07-07 01:15:25 +00:00
Local User
0527458f38 Merge branch 'upstream/main' into develop 2023-07-07 01:25:26 +02:00
Claire
ff7aae3037 Merge branch 'main' into glitch-soc/merge-upstream 2023-07-06 15:16:34 +02:00
Claire
5e1752ce3f
Bump version to v4.1.3 (#25757) 2023-07-06 15:14:42 +02:00
fef
47a672b898
bump to nyastodon 1.1.10 2023-07-02 21:03:09 +00:00
fef
ea737d53d4
fix nyastodon version string 2023-07-02 20:49:22 +00:00
fef
b4fa21bce4
merge catcatnya/main into main 2023-07-02 18:08:31 +00:00
Jeremy Kescher
2bcce397a9
Bump version 2023-05-27 15:06:05 +02:00
Jeremy Kescher
f158fb7151
ReactionsController: Don't check for status reaction existence in destroy 
UnreactService checks for its existence in the background anyway, so remove redundant checks.
 2023-05-11 13:45:14 +02:00
Jeremy Kescher
4252c6fe1e
Revert "Redo StatusReaction set_custom_emoji to be similar to AnnouncementReaction" 
This reverts commit b8774d3b5d, to address a regression when trying to react with non-local custom emoji.
 2023-05-11 12:39:24 +02:00
Jeremy Kescher
0a67076fa9
Bump version 2023-05-10 21:12:23 +02:00
Jeremy Kescher
9fe04326ea
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	.github/workflows/build-image.yml
#	config/routes.rb
#	db/schema.rb
#	lib/mastodon/version.rb
 2023-05-09 23:26:00 +02:00
Jeremy Kescher
d183f8c306
Bump version 2023-05-08 19:38:15 +02:00
Claire
d77fbbed73 Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream 
Conflicts:
- `.github/dependabot.yml`:
  Upstream made changes, but we had removed it.
  Discarded upstream changes.
- `.rubocop_todo.yml`:
  Upstream regenerated the file, we had some glitch-soc-specific ignores.
- `app/models/account_statuses_filter.rb`:
  Minor upstream code style change where glitch-soc had slightly different code
  due to handling of local-only posts.
  Updated to match upstream's code style.
- `app/models/status.rb`:
  Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one.
  Moved the definitions as upstream did.
- `app/services/backup_service.rb`:
  Upstream rewrote a lot of the backup service, glitch-soc had changes because
  of exporting local-only posts.
  Took upstream changes and added back code to deal with local-only posts.
- `config/routes.rb`:
  Upstream split the file into different files, while glitch-soc had a few
  extra routes.
  Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb`
  and `config/routes/admin.rb`
- `db/schema.rb`:
  Upstream has new migrations, while glitch-soc had an extra migration.
  Updated the expected serial number to match upstream's.
- `lib/mastodon/version.rb`:
  Upstream added support to set version tags from environment variables, while
  glitch-soc has an extra `+glitch` tag.
  Changed the code to support upstream's feature but prepending a `+glitch`.
- `spec/lib/activitypub/activity/create_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests due to
  `directMessage` handling.
  Applied upstream's changes while keeping glitch-soc's extra tests.
- `spec/models/concerns/account_interactions_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests.
  Applied upstream's changes while keeping glitch-soc's extra tests.
 2023-05-08 19:28:21 +02:00
Jeremy Kescher
628c027049
Merge remote-tracking branch 'upstream/main' into develop 2023-05-08 00:40:33 +02:00
Jeremy Kescher
9eb149477a
Merge remote-tracking branch 'upstream/main' into develop 2023-05-06 00:39:56 +02:00
Renaud Chaput
830e6cefae
Add version suffixes to nightly & edge image builds (#24823) 2023-05-04 13:45:39 +02:00
Jeremy Kescher
1fb6e312ff
Merge remote-tracking branch 'upstream/main' into develop 2023-04-27 08:59:13 +02:00
Jeremy Kescher
b87c94d437
Bump patch version 2023-04-21 15:06:41 +02:00
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
fef
b9afe72a3a
merge with catstodon/main v1.1.0 2022-12-17 16:15:16 +00: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
fef
1abd4ba866
bump to nyastodon 1.1.9 2022-12-11 23:24:20 +00:00
fef
5b69f3db10
merge catcatnya/main into main 2022-12-11 23:23:31 +00:00
Jeremy Kescher
3e17e5b2cb
Merge remote-tracking branch 'upstream/main' into develop 2022-12-09 23:46:41 +01:00
fef
e0c55d6043
bump to nyastodon 1.1.8 2022-12-09 15:02:09 +00:00
fef
380567f453
merge catstodon/main into main 2022-12-09 15:01:00 +00:00
Jeremy Kescher
7e19321520
Merge remote-tracking branch 'upstream/main' into develop 2022-12-07 17:49:14 +01:00
fef
ea10eabad6
merge catstodon/main into main 2022-12-07 13:22:33 +00: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
fef
fec439df28
bump to nyastodon 1.1.7 2022-12-03 17:56:35 +00:00
fef
c501a17b1f
merge catstodon/main into main 2022-12-02 01:41:43 +00:00
fef
fdc8dce395
bump to nyastodon 1.1.6 2022-12-02 01:07:17 +00:00
Jeremy Kescher
32600375b3
Merge remote-tracking branch 'upstream/main' into develop 2022-12-01 20:57:06 +01:00
fef
58145e775f
bump to nyastodon 1.1.5 2022-12-01 02:58:57 +00:00
fef
ca4df02956
merge catcatnya/main into main 2022-12-01 02:53:26 +00:00
Jeremy Kescher
bbbf5f1746
Upgrade ruby dependencies 2022-11-30 18:06:14 +01:00
fef
57e46f4aaf
merge catstodon/main into main 2022-11-30 16:35:05 +00:00
fef
4489c51bb9
bump to nyastodon 1.1.4 2022-11-30 16:30:42 +00:00
fef
ddeda89821
bump to nyastodon 1.1.3 2022-11-29 05:38:15 +00:00
fef
4e041d1e00
bump to nyastodon 1.1.2 2022-11-29 04:38:41 +00:00
fef
7f157c35cf
bump to nyastodon 1.1.1 2022-11-29 03:32:54 +00:00
Jeremy Kescher
730a09f642
v4.0.2+1.0.6 2022-11-29 00:15:08 +01:00
fef
0157438894
merge catcatnya/main into main 2022-11-28 22:47:46 +00:00
fef
1a84936322
bump to nyastodon 1.1.0 2022-11-28 22:47:32 +00:00