Skye
76b36ba10d
Revert "Revert "Merge remote-tracking branch 'TheEssem/feature/emoji-reactions' into th-downstream""
...
This reverts commit 8aae9712d9
9 months ago
Skye
8aae9712d9
Revert "Merge remote-tracking branch 'TheEssem/feature/emoji-reactions' into th-downstream"
...
This reverts commit fa3b5195fd1b1c4ff940
9 months ago
Skye
fa3b5195fd
Merge remote-tracking branch 'TheEssem/feature/emoji-reactions' into th-downstream
9 months ago
e9dbe31776
th: Merge remote-tracking branch 'glitch/main'
9 months ago
27f74617cc
th: Merge remote-tracking branch 'glitch/main' ( 915cd36ac1)
9 months ago
70de52c297
Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream
10 months ago
5b1eb09d54
Add annual reports for accounts ( #28693 )
10 months ago
528a8fa495
Merge commit 'f866413e724c2e7f8329fbc6e96f56f0b186c62a' into glitch-soc/merge-upstream
10 months ago
f0b93ab02f
Use AR `database_version` in PG version checks in migrations ( #28804 )
10 months ago
d156472304
Fix rubocop complaint
10 months ago
3da6e4d57f
More cleanup
10 months ago
f578317f53
Add support for emoji reactions
...
Squashed, modified, and rebased from glitch-soc/mastodon#2221 .
Co-authored-by: fef <owo@fef.moe>
Co-authored-by: Jeremy Kescher <jeremy@kescher.at>
Co-authored-by: neatchee <neatchee@gmail.com>
Co-authored-by: Ivan Rodriguez <104603218+IRod22@users.noreply.github.com>
Co-authored-by: Plastikmensch <plastikmensch@users.noreply.github.com>
10 months ago
08304075be
Fix old glitch-soc migration using removed `add_column_with_default` helper
10 months ago
23d8bd8ce1
Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream
10 months ago
630b245bb4
Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/settings/scoped_settings.rb`:
Removed upstream, while glitch-soc had a change related to its theming system.
Removed as well, as it's unused.
10 months ago
0b2c7cdb02
Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/content_security_policy.rb`:
Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS`
environment variable.
Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.
10 months ago
ea1c0feb86
Remove `add_column_with_default` migration helper ( #28654 )
10 months ago
173953c23e
Fix ISO code for Canadian French ( #26015 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
10 months ago
ae39bed95b
Solve remaining `db/*migrate*` cops ( #28579 )
10 months ago
dfdadb92e8
Add ability to require approval when users sign up using specific email domains ( #28468 )
10 months ago
0b5783f3f1
Merge commit 'f92d8c654df654538096efff05e9b1a989d01490' into glitch-soc/merge-upstream
10 months ago
51d2b80ff7
Solve `Abc/*` metrics for `db/*migrate*` files ( #28568 )
10 months ago
c5b0e6d5a0
Merge branch 'main' into glitch-soc/merge-upstream
11 months ago
f2eb5038a6
Fix linting warning in glitch-soc-only migration
11 months ago
f5b7307890
Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's version of the conflicting lines.
11 months ago
077e0c6812
Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Conflict caused by the `json` gem thing once again.
Updated as upstream did, but keeping the most recent `json` version.
- `spec/helpers/application_helper_spec.rb`:
Upstream refactored a bunch of specs, including one place that differs
because of glitch-soc's theming system.
Refactored as upstream did, adapting it for glitch-soc's theming system.
11 months ago
b5ac61b2c5
Change algorithm of follow recommendations ( #28314 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
d6ad9d351e
Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream
11 months ago
4113fbf6e8
Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream enforced new code style rules, where we had different code.
Applied the new code style rules.
11 months ago
3e336fe706
Opt out of `Rails/SkipsModelValidations` cop in db/migrate ( #28371 )
11 months ago
469ee2ae36
Fix `Style/HashEachMethods` cop ( #28173 )
11 months ago
78a9906dfe
Merge remote-tracking branch 'glitch/main' ( a21fe8687e)
12 months ago
0d14fcebae
Change link previews to keep original URL from the status ( #27312 )
1 year ago
c501d626e8
Fix `Rails/BulkChangeTable` cop ( #26890 )
1 year ago
b24d7bb6f2
th: Merge remote-tracking branch 'glitch/main' ( 18eacc7a07)
1 year ago
1288d4c9b6
th: Merge remote-tracking branch 'glitch/main' ( 5efa6ac771)
1 year ago
74fd46d3ab
Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream
1 year ago
bcd0171e5e
Fix `Lint/UselessAssignment` cop ( #27472 )
1 year ago
a1b27d8b61
Fix `Naming/VariableNumber` cop ( #27447 )
1 year ago
b57ec6ad6b
Fix some settings not being properly migrated when set to `false`
1 year ago
f05985f8ec
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream changed their README, we have a completely different one.
Kept our version.
1 year ago
890e334703
Add migration tests for negative settings ( #27012 )
1 year ago
150feaf9b7
th: Merge remote-tracking branch 'glitch/main'
1 year ago
6a9e93ae19
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
f19239e026
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
abcc0b38fa
Fix incorrect PostgreSQL version check ( #26979 )
1 year ago
883609356e
Fix incorrect PostgreSQL version check ( #26979 )
1 year ago
9d32bdbcde
th: Merge remote-tracking branch 'glitch/main'
1 year ago
08b495d95c
Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream
1 year ago
296e8f791e
Merge commit '1efbb6202400d84024e68975c5cedd65efe71a80' into glitch-soc/merge-upstream
1 year ago
Skye
Kouhai
Claire
Eugen Rochko
Matt Jankowski
Essem
gunchleoc
kouhai