mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity
23,003 Commits 2 Branches 16 Tags 298 MiB
Commit Graph

1194 Commits

Author SHA1 Message Date
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 29124990a2 Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream reworked how CSS classes for the document's body are computed.
  Slight conflict due to glitch-soc's different theming system.
  Updated as upstream did.
 2024-09-06 19:25:31 +02:00
Emelia Smith c88ba523ee
Fix sort order of moderation notes on Reports and Accounts (#31528) 2024-09-06 14:58:36 +00:00
Matt Jankowski 6b6a80b407
Remove `body_as_json` in favor of built-in `response.parsed_body` for JSON response specs (#31749) 2024-09-06 09:58:46 +00:00
Matt Jankowski 7efe0bde9d
Add `have_http_link_header` matcher and set header values as strings (#31010) 2024-09-05 20:05:38 +00:00
Claire 1a0ef0c526 Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream 2024-09-05 20:36:25 +02:00
Matt Jankowski e820cc30b8
Convert invites controller spec to system/request specs (#31755) 2024-09-05 11:54:27 +00:00
Claire 5a55180b95 Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-soc/merge-upstream 
Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
  Upstream rewrote top-level `describe` calls to `RSpec.describe`, and
  glitch-soc had differences in the first few tests because of the wider
  subset of HTML it accepts.
  Changed `describe` to `RSpec.describe` as upstream did, keeping
  glitch-soc's tests.
 2024-09-04 19:38:52 +02:00
Matt Jankowski e1b5f3fc6f
Use `response.parsed_body` for html response checks (#31750) 2024-09-04 17:29:05 +00:00
Matt Jankowski f1003b2560
Enable "zero monkey patching" mode in RSpec (#31614) 2024-09-04 05:12:25 +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 e1fa456c7c
Add `have_cacheable_headers` matcher for responses (#31727) 2024-09-03 15:35:19 +00:00
Matt Jankowski 928390c2ba
Convert `admin/settings` controller specs to system specs (#31548) 2024-09-03 15:29:32 +00:00
Matt Jankowski 5b595b8a5a
Remove usage of `assigns` in controller specs (#30195) 2024-09-03 15:23:16 +00:00
Matt Jankowski 219458d7d4
Convert `tags` controller spec to system and request specs (#31708) 2024-09-03 13:18:53 +00:00
Claire 6f35e93f72 Merge commit '02633d6ebbe944a8769c8f2229fa9e0d6c7d1142' into glitch-soc/merge-upstream 2024-08-31 16:06:04 +02:00
Matt Jankowski 1ee1c329cc
Convert `admin/announcements` controller spec to system spec (#31655) 2024-08-30 07:15:28 +00:00
Matt Jankowski 02585d8789
Convert `media` controller spec to request spec (#31634) 2024-08-29 08:46:00 +00:00
Matt Jankowski b9269c8d38
Convert `admin/reset` controller spec to system spec (#31643) 2024-08-29 08:38:17 +00:00
Matt Jankowski 0ef636f72d
Convert `shares` controller spec to system spec (#31619) 2024-08-28 07:58:40 +00:00
Matt Jankowski 00586d27cb
Convert `instance_actor` controller spec to request spec (#31621) 2024-08-28 07:56:07 +00:00
Claire 94d8cdc494 Merge commit '04f0468016b450ace8e0ce707b4c21aa18b51262' into glitch-soc/merge-upstream 2024-08-27 20:00:07 +02:00
Matt Jankowski 3959f36d19
Add checks about response body content to admin/dash spec (#30716) 2024-08-27 14:59:56 +00:00
Matt Jankowski 48f4e5444d
Convert `media_proxy` controller spec to request spec (#31600) 2024-08-27 09:44:16 +00:00
Matt Jankowski a7f8417795
Convert "CSV export" settings controller specs to request specs (#31601) 2024-08-27 08:12:39 +00:00
Matt Jankowski 38a3466741
Convert `api/oembed` controller spec to request spec (#31605) 2024-08-27 07:55:25 +00:00
Matt Jankowski c09d232ee3
Convert `api/web/settings` controller spec to request spec (#31606) 2024-08-27 07:42:35 +00:00
Claire 11b8017b45 Merge commit 'e38ce3beb7b83f43ef6e6f144c19b186c393910c' into glitch-soc/merge-upstream 2024-08-26 18:52:33 +02:00
Matt Jankowski 4c2534d12e
Convert "static page" controller specs to system specs (#31599) 2024-08-26 15:53:48 +00:00
Matt Jankowski dbe0ee8a81
Convert `emojis` controller spec to request spec (#31597) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-08-26 15:00:05 +00:00
Matt Jankowski 5172d84946
Convert `manifest` controller spec to request spec (#31596) 2024-08-26 14:37:23 +00:00
Matt Jankowski 36ccdcc9e1
Convert "custom css" controller spec to request spec (#31595) 2024-08-26 14:36:31 +00:00
Matt Jankowski 641ae6a2cf
Convert health check endpoint controller spec to request spec (#31565) 2024-08-26 12:17:35 +00:00
Claire 654187a995 Merge commit '1229d2907a4a7ee09ee42cd24043d74561507e0a' into glitch-soc/merge-upstream 2024-07-29 19:16:58 +02:00
Emelia Smith c40e481169
Implement UI for Admin Search of Hashtags (#30880) 2024-07-29 15:49:44 +00:00
Claire fb411b6d0f Merge commit 'dd5379271410219de0806bb33e7cdfa427ea6988' into glitch-soc/merge-upstream 2024-07-27 13:19:38 +02:00
David Roetzel dd53792714
Move UI tests from controller to system spec (#31158) 2024-07-26 14:53:49 +00:00
Emelia Smith 693d9b03ed
Enable OAuth PKCE Extension (#31129) 2024-07-26 08:53:10 +00:00
Claire 68000956f4 Merge commit 'cd0ca4b99473f54464e5134f91b7b1c8d5544011' into glitch-soc/merge-upstream 2024-07-23 19:31:23 +02:00
Emelia Smith bb2e5a4b58
Add audit logs to Admin::InstancesController (#27386) 2024-07-23 08:12:30 +00:00
Claire c75fe09e2b Merge commit '82344342c1c5adb3f6a4b376559db737a9e982b7' into glitch-soc/merge-upstream 2024-07-18 17:56:25 +02:00
Matt Jankowski 2616fde9e6
Use change-requiring records in admin/reports controller spec (#31052) 2024-07-18 07:49:44 +00:00
Claire 5e7720d11b Merge commit 'aa4d8987a00fe82490fb949b82d3baa33d0acd49' into glitch-soc/merge-upstream 2024-07-17 22:20:12 +02:00
Matt Jankowski 76c2c5c748
Reduce extra round trips in `activitypub` controller specs (#31041) 2024-07-17 08:09:34 +00:00
Claire 55cf5e0188 Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream 2024-07-12 13:41:54 +02:00
Matt Jankowski 73d53827ea
Add change assertion to invites destroy spec (#31004) 2024-07-12 08:19:15 +00:00
Claire 6a55232988 Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream 2024-07-08 19:41:14 +02:00
Matt Jankowski f1300ad284
Rename jobs/attachments rspec tag names (#29762) 2024-07-08 16:01:08 +00: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