Jeremy Kescher
0b66cfbc8d
Merge remote-tracking branch 'upstream/main' into develop
Bundler Audit / security (push) Has been cancelled
Check i18n / check-i18n (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
CodeQL / Analyze (ruby) (push) Has been cancelled
Crowdin / Upload translations / upload-translations (push) Has been cancelled
Check formatting / lint (push) Has been cancelled
CSS Linting / lint (push) Has been cancelled
Haml Linting / lint (push) Has been cancelled
JavaScript Linting / lint (push) Has been cancelled
Ruby Linting / lint (push) Has been cancelled
JavaScript Testing / test (push) Has been cancelled
Historical data migration test / test (14-alpine) (push) Has been cancelled
Historical data migration test / test (15-alpine) (push) Has been cancelled
Ruby Testing / build (production) (push) Has been cancelled
Ruby Testing / build (test) (push) Has been cancelled
Ruby Testing / test (.ruby-version) (push) Has been cancelled
Ruby Testing / test (3.1) (push) Has been cancelled
Ruby Testing / test (3.2) (push) Has been cancelled
Ruby Testing / Libvips tests (.ruby-version) (push) Has been cancelled
Ruby Testing / Libvips tests (3.1) (push) Has been cancelled
Ruby Testing / Libvips tests (3.2) (push) Has been cancelled
Ruby Testing / End to End testing (.ruby-version) (push) Has been cancelled
Ruby Testing / End to End testing (3.1) (push) Has been cancelled
Ruby Testing / End to End testing (3.2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
2024-09-10 16:15:59 +02:00
Claire
1436db389e
Merge pull request #2839 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 2caa3f365d
2024-09-09 20:02:04 +02:00
Claire
441af2632d
Merge commit '2caa3f365ded73be17b623177967110e66f14061' into glitch-soc/merge-upstream
2024-09-09 18:22:41 +02:00
github-actions[bot]
2caa3f365d
New Crowdin Translations (automated) ( #31800 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-09 12:38:43 +00:00
renovate[bot]
1d03570080
Update dependency postcss-preset-env to v10.0.3 ( #31821 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-09 11:16:09 +00:00
Mike Dalessio
a0ea2fa3b0
Change fetch link card service to parse as HTML5 ( #31814 )
2024-09-09 10:59:42 +00:00
renovate[bot]
9d9901cc5b
Update peter-evans/create-pull-request action to v7 ( #31818 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-09 08:43:12 +00:00
Matt Jankowski
e6969cf4e4
Add method for media-referencing status in AccountStatusCleanupPolicy
( #31798 )
2024-09-09 08:33:51 +00:00
renovate[bot]
1f13b87567
Update dependency pg to v1.5.8 ( #31795 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-09 08:31:13 +00:00
Matt Jankowski
c6a0768fe5
Use shared system spec helper methods ( #31784 )
2024-09-09 08:01:26 +00:00
Mike Dalessio
82161d8ae5
Change Account::Field parsing to use HTML5::DocumentFragment ( #31813 )
2024-09-08 18:56:18 +00:00
Mike Dalessio
afa2e257e4
Change verify link service to use CSS selectors instead of a complex XPath query ( #31815 )
2024-09-08 18:50:22 +00:00
Mike Dalessio
10143d053a
Change some instances of Nokogiri HTML4 parsing to HTML5 ( #31812 )
2024-09-08 18:41:37 +00:00
Claire
9dcc6808d6
Merge pull request #2837 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to b716248fc5
2024-09-07 10:16:46 +02:00
Claire
5c97ccf939
Merge commit 'b716248fc5bde4dc47b8104d092d092d87c50f1a' into glitch-soc/merge-upstream
2024-09-06 20:10:53 +02:00
Claire
af6ca96a4e
Fix tests in glitch-soc
2024-09-06 20:00:19 +02: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
Claire
b716248fc5
Add link to /admin/roles
in moderation interface when changing someone's role ( #31791 )
2024-09-06 17:21:49 +00:00
Matt Jankowski
7335a43b6d
Use async count in admin dashboard ( #30606 )
2024-09-06 16:52:35 +00:00
Matt Jankowski
0a433d08fb
Move shares/modal body class to layout ( #31789 )
2024-09-06 16:46:55 +00:00
Matt Jankowski
4f81ad2494
Add coverage for media#player
, move body class to view ( #31790 )
2024-09-06 16:46:25 +00:00
Matt Jankowski
b530fc5267
Update rails to version 7.1.4 ( #31563 )
2024-09-06 15:22:35 +00: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
a9d0b48b65
Set "admin" body class from admin
nested layout ( #31269 )
2024-09-06 13:58:46 +00:00
Emelia Smith
fd7fc7bdc3
Disable actions on reports that have already been taken ( #31773 )
2024-09-06 12:50:30 +00:00
Claire
1fed11cfa7
Target firefox all the way back to Firefox 78 ( #31782 )
2024-09-06 12:33:38 +00:00
Claire
ebf09328d4
Disable codecov github annotations ( #31783 )
2024-09-06 10:58:53 +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
be77a1098b
Extract Account::AUTOMATED_ACTOR_TYPES
for "bot" actor_type values ( #31772 )
2024-09-06 07:49:38 +00:00
github-actions[bot]
cc4865193a
New Crowdin Translations (automated) ( #31781 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-06 07:38:08 +00:00
renovate[bot]
60182db0ca
Update dependency tzinfo-data to v1.2024.2 ( #31780 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-06 07:30:53 +00:00
Claire
4cd74585ae
Merge pull request #2836 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 5acec087ca
2024-09-05 22:56:10 +02: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
Matt Jankowski
09017dd8f0
Add worker spec for annual report worker ( #31778 )
2024-09-05 19:51:17 +00:00
Michael Stanclift
db6b1fe8fb
[Glitch] Fix radio checkbox visibility in Report dialogs
...
Port b4b639ee4a
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-05 20:40:31 +02:00
Eugen Rochko
cb324b5d7c
[Glitch] Change design of unread conversations in web UI
...
Port ec4c49082e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-05 20:40:04 +02:00
Claire
1a0ef0c526
Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream
2024-09-05 20:36:25 +02:00
Matt Jankowski
5acec087ca
Simplify basic presence validations ( #29664 )
2024-09-05 15:36:05 +00:00
Eugen Rochko
bc435c63bd
Change width of columns in advanced web UI ( #31762 )
2024-09-05 14:57:53 +00:00
Matt Jankowski
850478dc14
Use conflicted
configuration for renovate rebase strategy ( #31770 )
2024-09-05 14:41:14 +00:00
Matt Jankowski
d58faa2018
Remove references to deprecated Import
model ( #31759 )
2024-09-05 14:07:17 +00:00
David Roetzel
f85694acfd
Add credentials to redis sentinel configuration ( #31768 )
2024-09-05 14:06:58 +00:00
Michael Stanclift
b4b639ee4a
Fix radio checkbox visibility in Report dialogs ( #31752 )
2024-09-05 12:34:13 +00:00
Matt Jankowski
e820cc30b8
Convert invites controller spec to system/request specs ( #31755 )
2024-09-05 11:54:27 +00:00
renovate[bot]
5b1ae15a36
Update docker.io/ruby Docker tag to v3.3.5 ( #31758 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-05 11:06:05 +00:00
Matt Jankowski
8fd3e37747
Update parser
and rubocop
gems ( #31760 )
2024-09-05 10:20:27 +00:00
renovate[bot]
bd8cd0c6e7
Update dependency cssnano to v7.0.6 ( #31757 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-05 09:50:38 +00:00
James May
f9712fad1b
Direct link to each authorized_application entry with html anchor ( #31677 )
...
Co-authored-by: Matt Jankowski <matt@jankowski.online>
2024-09-05 09:48:42 +00:00
Matt Jankowski
ba9fd1c32e
Add coverage for Account#prepare_contents
callback ( #31748 )
2024-09-05 09:48:33 +00:00
Eugen Rochko
b265a654d7
Fix wrong width on content warnings and filters in web UI ( #31761 )
2024-09-05 09:46:11 +00:00