Claire
dfe851b476
Merge branch 'stable-4.3' into glitch-soc/backports-4.3
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream added a helper where glitch-soc had its own, not really
a conflict.
Added upstream's helper.
2024-10-05 20:45:05 +02:00
Matt Jankowski
ceba0f082e
Provide use_path to qr generator for svg data size reduction ( #32127 )
2024-10-04 17:48:03 +02:00
Claire
633165ba9c
Merge commit '28966fa0a6d7b98ee94696acdc79e45449ce8349' into glitch-soc/merge-upstream
2024-09-25 17:41:37 +02:00
Matt Jankowski
06ecf9008b
Remove single-use shared examples in controller specs ( #32044 )
2024-09-25 07:50:15 +00:00
Claire
c2c3a66478
Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream
2024-09-23 20:24:18 +02:00
Matt Jankowski
5dfdec6453
Convert settings/applications controller spec to system/request specs ( #32006 )
2024-09-23 13:37:32 +00:00
Claire
221bba1897
Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream
2024-09-21 15:06:06 +02:00
Matt Jankowski
5a8f2fe31d
Convert settings/exports controller spec to system/request specs ( #31965 )
2024-09-19 13:43:40 +00:00
Claire
83b553c7d1
Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream
2024-09-12 21:32:39 +02:00
Matt Jankowski
207c073bf8
Remove debug output in migration controller spec ( #31886 )
2024-09-12 14:04:46 +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
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
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
5b595b8a5a
Remove usage of assigns in controller specs ( #30195 )
2024-09-03 15:23:16 +00:00
Claire
94d8cdc494
Merge commit '04f0468016b450ace8e0ce707b4c21aa18b51262' into glitch-soc/merge-upstream
2024-08-27 20:00:07 +02:00
Matt Jankowski
a7f8417795
Convert "CSV export" settings controller specs to request specs ( #31601 )
2024-08-27 08:12:39 +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
Claire
395f17ca17
Merge pull request from GHSA-vp5r-5pgw-jwqx
...
* Fix streaming sessions not being closed when revoking access to an app
* Add tests for GHSA-7w3c-p9j8-mq3x
2024-07-04 16:11:28 +02:00
Claire
f214813919
Adapt settings spec to glitch-soc
2024-06-11 19:54:27 +02:00
Claire
4daed855e5
Merge commit 'd818ddd6870094e89e58ef61f37da4cb73935856' into glitch-soc/merge-upstream
2024-06-11 19:46:11 +02:00
Matt Jankowski
edf6d64eeb
Use correct params in settings/preferences/appearance spec ( #30379 )
2024-06-11 07:36:46 +00:00
Claire
a5127d0ef8
Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream
...
Conflicts:
- `config/routes/api.rb`:
glitch-soc has an extra `:destroy` action on notifications for historical reasons.
Kept it for now, while otherwise updating as upstream did.
2024-03-11 17:29:07 +01:00
Eugen Rochko
50b17f7e10
Add notification policies and notification requests ( #29366 )
2024-03-07 14:53:37 +00:00
Claire
15bc13c65b
Merge commit '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream
2024-01-11 20:15:19 +01:00
Claire
23d8bd8ce1
Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream
2024-01-11 13:24:20 +01:00
Matt Jankowski
87097a227c
Clean up settings/featured_tags/index view ( #28688 )
2024-01-11 10:45:26 +00:00
Matt Jankowski
55802242ce
Refactor login activity partial (remove inline ruby) ( #28687 )
2024-01-11 10:36:27 +00:00
Matt Jankowski
00341c70ff
Use Sidekiq fake! instead of inline! in specs ( #25369 )
2024-01-10 11:06:58 +00:00
Claire
c5b0e6d5a0
Merge branch 'main' into glitch-soc/merge-upstream
2023-12-28 16:57:10 +01:00
Claire
f5b7307890
Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's version of the conflicting lines.
2023-12-21 19:24:10 +01:00
Matt Jankowski
f32d672d2f
Clean up of RSpec/LetSetup within spec/controllers ( #28446 )
2023-12-21 09:28:41 +00:00
Claire
b8209c3b96
Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream reworked the CSP, we kept our version for now.
- `spec/requests/content_security_policy_spec.rb`:
Upstream reworked the CSP, we kept our version for now.
2023-12-20 20:10:45 +01:00
Claire
2e786e13cb
Merge commit '973597c6f1e25b16c592e5573304319aeaa375e1' into glitch-soc/merge-upstream
...
Conflicts:
- `app/validators/status_pin_validator.rb`:
Upstream refactored that file, while glitch-soc had configurable limits for
pinned statuses.
Updated the code with upstream's refactor, while keeping glitch-soc's
configurability.
2023-12-19 20:51:37 +01:00
Claire
a111fd7a0b
Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream
2023-12-18 20:47:27 +01:00
Claire
d6ad9d351e
Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream
2023-12-18 19:10:43 +01:00
Claire
46ddaffd40
Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream
2023-12-18 18:34:25 +01:00
Claire
bc33be0342
Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Conflict because we had updated the `json-ld` gem to fix a yanked dependency.
Kept our version of `json-ld` while updating other dependencies.
2023-12-18 18:07:24 +01:00
Matt Jankowski
ef9797a395
Un-nest contexts in settings/2fa/webauthn spec ( #28359 )
2023-12-14 10:46:43 +00:00
Matt Jankowski
ce78a9c9ac
Clean up two_factor_authentication/confirmations controller spec ( #28128 )
2023-11-30 11:44:42 +00:00
Matt Jankowski
973597c6f1
Consolidate configuration of Sidekiq::Testing.fake! setup ( #28046 )
2023-11-23 09:43:43 +00:00
Eugen Rochko
cdc57c74b7
Fix unsupported time zone or locale preventing sign-up ( #28035 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-11-22 11:38:07 +00:00
Matt Jankowski
f7cb64a184
Add coverage for settings/privacy controller ( #28000 )
2023-11-21 13:02:37 +00:00
Matt Jankowski
b2e8af8889
Add coverage for settings/verifications controller ( #28001 )
2023-11-21 11:00:22 +00:00
Matt Jankowski
b2c5b20ef2
Fix RSpec/AnyInstance cop ( #27810 )
2023-11-14 14:52:59 +00:00
Matt Jankowski
9dc3ce878b
Speed-up in Settings:: controllers specs ( #27808 )
2023-11-10 15:13:42 +00:00
Matt Jankowski
ce91d14d48
Fix Style/WordArray cop ( #27770 )
2023-11-08 13:03:44 +00:00
