tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,556 Commits 5 Branches 0 Tags
Commit Graph

961 Commits

Author SHA1 Message Date
Matt Jankowski
d56aa9031a
Disable Naming/VariableNumber cop in old migrations (#33274) 2024-12-12 08:15:38 +00:00
Matt Jankowski
43702b95a2
Enable Rails/ReversibleMigration cop (#33264) 2024-12-11 15:50:50 +00:00
Matt Jankowski
d6241f6751
Fix Rails/ThreeStateBooleanColumn cop (#33269) 2024-12-11 14:25:48 +00:00
Matt Jankowski
e4e35ab134
Add NOT NULL requirement to account columns on AccountPin (#33244) 2024-12-10 15:50:49 +00:00
Eugen Rochko
30aa0df88c
Add terms of service (#33055) 2024-12-09 10:04:46 +00:00
Claire
fbcd14ff7e
Always remove setting keys in legacy user settings migrations (#33196) 2024-12-06 10:58:18 +00:00
Matt Jankowski
a1143c522b
Add missing on_delete: :cascade foreign keys option (#33175) 2024-12-06 08:29:54 +00:00
Eugen Rochko
d29eddc401
Fix tag trend migration failing due to duplicate rows (#33189) 2024-12-05 16:12:26 +00:00
Matt Jankowski
17c02c9210
Remove thing_type and thing_id columns from settings table (#31971) 2024-12-05 14:34:14 +00:00
Matt Jankowski
4934242aca
Update schema/annotations after tag trend db/redis migrate (#33173) 2024-12-04 17:55:56 +00:00
Eugen Rochko
48ea7552dd
Change hashtag trends to be stored in the database instead of redis (#32837) 
Co-authored-by: David Roetzel <david@roetzel.de>
 2024-12-04 11:59:17 +00:00
Claire
4f1242964b Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream 2024-11-15 18:44:32 +01:00
Matt Jankowski
897cb1803e
Run bin/rails db:schema:dump under Rails 7.2 (#32838) 2024-11-12 08:56:04 +00:00
Claire
f0f807cec7 Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream 2024-11-10 13:18:43 +01:00
Matt Jankowski
f180880f65
Remove postgres version support check for REINDEX in migration (#32744) 2024-11-07 15:40:41 +00:00
Eugen Rochko
90f4ffa31d
Fix performance of percentile calculation for annual reports (#32765) 2024-11-04 10:11:06 +00:00
Claire
f624ef2778 Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/formatting_helper.rb`:
  Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span.
  Wrapped the modified code.
 2024-11-03 20:51:58 +01:00
Jonny Saunders
9074c1fac9
Use likes and shares totalItems on status creations and updates (#32620) 2024-10-28 04:55:18 +00:00
Claire
8103e69b17 Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict caused by glitch-soc changing the path to images, and upstream
  removing styling using such an image.
  Removed the styling as upstream did.
- `app/models/account.rb`:
  Conflict due to upstream changing lines adjacent to a change made in glitch-soc
  to have configurable limits.
  Ported upstream's changes.
- `yarn.lock`:
  Dependencies adjacent to glitch-soc-only dependencies updated.
  Updated them as well.
 2024-10-26 13:38:07 +02:00
Matt Jankowski
fae1de699c
Remove duplicate indexes from database (#32454) 2024-10-23 13:26:51 +00:00
Claire
c574f5b53f
Change how migrations duplicated between glitch and upstream are handled (#2878) 2024-10-09 18:36:19 +02:00
Claire
7e06d724c9 Merge commit '4238da6ee3c93dfd5752e9133cbec958f8ebb18a' into glitch-soc/merge-upstream 2024-10-07 20:45:07 +02:00
Claire
a59160cf01
Add missing on_delete: :cascade on notification_permissions (#32281) 2024-10-07 07:46:03 +00:00
Claire
b28ce2424c Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper where glitch-soc had its own, not really
  a conflict.
  Added upstream's helper.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream renamed a constant that was used slightly differently in glitch-soc.
  Renamed it as upstream did.
 2024-10-06 16:07:58 +02:00
Matt Jankowski
4cae309f6a
Fix Rails/CreateTableWithTimestamps cop (#30836) 2024-10-01 13:56:43 +00:00
Claire
221bba1897 Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream 2024-09-21 15:06:06 +02:00
Claire
62a39d60ce
Fix rolling updates by moving DropEndToEndMessageTables to post-deployment migrations (#31963) 2024-09-19 09:50:06 +00:00
Matt Jankowski
6f836c45aa
Remove crypto values from doorkeeper application/token scopes (#31945) 2024-09-18 09:27:50 +00:00
Matt Jankowski
5405bdd344
Remove unused E2EE messaging code (#31193) 2024-09-18 09:27:43 +00:00
Claire
10e2b87774 Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream 2024-09-12 12:09:21 +02:00
Eugen Rochko
e0c27a5047
Add ability to manage which websites can credit you in link previews (#31819) 2024-09-10 12:00:40 +00:00
Claire
fef055db96 Merge commit 'c9ea91f8683cd5c0cfac14071a17e3956ac6d3b0' into glitch-soc/merge-upstream 
Conflicts:
- `spec/requests/api/v1/timelines/tag_spec.rb`:
  Upstream refactored this file, while we had a change to switch a default setting.
  Updated as upstream did.
- `spec/views/statuses/show.html.haml_spec.rb`:
  Upstream refactored this file, while we stubbed different methods.
  Updated as upstream did, and updated the stubs accordingly.
 2024-09-03 21:51:53 +02:00
Matt Jankowski
4682804448
Fix Rails/ReversibleMigration cop for remove_index (#30832) 2024-09-03 15:32:22 +00:00
Claire
402c1e116d Merge commit '491033c86cc9c29302bfe68cc94dabad82ded4cc' into glitch-soc/merge-upstream 2024-09-02 17:43:10 +02:00
David Roetzel
388d5473e1
Refactor (ruby) redis configuration (#31694) 2024-09-02 14:19:55 +00:00
Claire
11b8017b45 Merge commit 'e38ce3beb7b83f43ef6e6f144c19b186c393910c' into glitch-soc/merge-upstream 2024-08-26 18:52:33 +02:00
Matt Jankowski
bcc4b1078c
Fix Rails/RootPathnameMethods cop (#31582) 2024-08-26 07:35:07 +00:00
Claire
31a00c0c1a Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-soc/merge-upstream 2024-08-09 17:15:32 +02:00
Claire
cbdd8edf68
Revamp notification policy options (#31343) 2024-08-09 13:30:55 +00:00
Claire
fb411b6d0f Merge commit 'dd5379271410219de0806bb33e7cdfa427ea6988' into glitch-soc/merge-upstream 2024-07-27 13:19:38 +02:00
Emelia Smith
693d9b03ed
Enable OAuth PKCE Extension (#31129) 2024-07-26 08:53:10 +00:00
Claire
cf5d2c3fe4 Merge commit '887e64efd4abbf3980e008c7a5441b44fbd6c766' into glitch-soc/merge-upstream 2024-07-25 17:47:02 +02:00
Matt Jankowski
34626b8291
Update schema to reflect full db:migrate run results (#31128) 2024-07-25 10:37:48 +00:00
Claire
c546757cd1 Merge commit '66430cb25c824cfad0394216d8e7a523533bcf4b' into glitch-soc/merge-upstream 2024-07-16 17:54:36 +02:00
Emelia Smith
aa88aca0ad
Add optional OAuth application to reports (#30539) 2024-07-16 13:23:08 +00:00
Claire
edec2e9fdf Merge commit '00cb4a0313190bfa118966692a649db9c8328094' into glitch-soc/merge-upstream 2024-07-14 18:43:35 +02:00
David Roetzel
35a437a03f
Destroy NotificationRequests that are dismissed (#31008) 2024-07-12 12:09:52 +00:00
Claire
d2aea85e6c Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream 2024-06-30 11:25:40 +02:00
Matt Jankowski
51f581e03e
Fix Rails/ReversibleMigration cop for remove (#30833) 2024-06-26 13:51:44 +00:00
Matt Jankowski
528a7f57fa
Fix Rails/ReversibleMigration cop for change_column (#30835) 2024-06-26 13:51:11 +00:00