Commit graph

173 commits

Author SHA1 Message Date
KMY
a5bbc3f93b Merge remote-tracking branch 'parent/main' into upstream-20240824 2024-08-24 09:39:11 +09:00
Renaud Chaput
4a968cb7a9
Add icon field to instance endpoint (#30205) 2024-08-22 10:04:27 +00:00
KMY
af0f8f01e1 Merge remote-tracking branch 'parent/main' into upstream-20240821 2024-08-21 12:39:30 +09:00
Matt Jankowski
f91403ccaa
Remove unused fa_icon helper method (#31511) 2024-08-20 15:59:59 +00:00
Matt Jankowski
fa2e7b1708
Migrate fontawesome->material in more views (#31360) 2024-08-20 11:52:45 +00:00
KMY
e7ccc0539f Merge remote-tracking branch 'parent/main' into upstream-20240813 2024-08-13 07:01:38 +09:00
Matt Jankowski
52a626f39b
Replace more font-awesome icons in app/helpers (#30962) 2024-08-07 22:53:15 +00:00
KMY
aa2cdc898a Merge remote-tracking branch 'parent/main' into upstream-20240618 2024-06-18 07:43:33 +09:00
Matt Jankowski
d7b7617321
Use class_names in admin/account_moderation_notes helper (#30719) 2024-06-17 12:20:57 +00:00
KMY
c546939a40 Merge remote-tracking branch 'parent/main' into upstream-20240524 2024-05-24 08:33:49 +09:00
Claire
de4815afda
Add more tests for self-destruct mode (#30374) 2024-05-20 10:06:51 +00:00
KMY
094ff9d2ee Merge remote-tracking branch 'parent/main' into upstream-20240517 2024-05-17 08:53:59 +09:00
Jason Punyon
85c625d319
Fix repetitive database queries from #30040 (#30259) 2024-05-15 09:38:16 +00:00
KMY
89b71363ae Merge remote-tracking branch 'parent/main' into upstream-20240507 2024-05-07 08:05:04 +09:00
Fawaz Farid
bc24c4792d
Allow admins to configure instance favicon and logo (#30040) 2024-05-06 15:06:52 +00:00
KMY
45c5c7b055 Merge remote-tracking branch 'parent/main' into upstream-20240408 2024-04-08 07:44:47 +09:00
Matt Jankowski
b61ae28f8d
Separate methods for theme style and meta color tags (#29802) 2024-04-05 09:52:43 +00:00
KMY
76598bd542 Merge remote-tracking branch 'parent/main' into upstream-20240319 2024-03-19 09:15:20 +09:00
Matt Jankowski
6d2986017e
Remove unused active_nav_class helper method (#29617) 2024-03-18 13:24:59 +00:00
Matt Jankowski
92855948a0
Remove unused show_landing_strip? helper method (#29618) 2024-03-18 08:55:54 +00:00
Matt Jankowski
ecdbf15ebe
Remove unused link_to_older and link_to_newer helper methods (#29620) 2024-03-18 08:54:46 +00:00
KMY(雪あすか)
941705be62
Change: #621 登録時間帯制限で、制限時間中は登録を禁止ではなく承認制にする (#628)
* Change: #621 登録時間帯制限で、制限時間中は登録を禁止ではなく承認制にする

* 管理画面のUIを改善

* Fix test

* Fix lint
2024-03-04 12:38:56 +09:00
KMY
54ee9772fb Merge remote-tracking branch 'parent/main' into upstream-20240216 2024-02-16 20:33:24 +09:00
Claire
9fee5e8526
Merge pull request from GHSA-jhrq-qvrm-qr36
* Fix insufficient Content-Type checking of fetched ActivityStreams objects

* Allow JSON-LD documents with multiple profiles
2024-02-16 11:56:12 +01:00
KMY
a6b57e3890 Merge remote-tracking branch 'parent/main' into upstream-20231221 2023-12-21 08:37:12 +09:00
Claire
6fed0fcbaa
Remove unneeded settings cleanup from specs (#28425) 2023-12-19 15:17:22 +00:00
Matt Jankowski
476d1237d4
Typo fix in json ld helper spec (#28417) 2023-12-18 16:47:22 +00:00
KMY
f20cb3fd59 Merge remote-tracking branch 'parent/main' into kb_development 2023-12-09 10:04:10 +09:00
Matt Jankowski
0b4a3a0437
Remove remaining without_partial_double_verification usage (#28127) 2023-12-07 12:15:50 +00:00
KMY
0704829a9b Merge remote-tracking branch 'parent/main' into upstream-20231116 2023-11-14 09:14:19 +09:00
Eugen Rochko
0d14fcebae
Change link previews to keep original URL from the status (#27312) 2023-11-13 09:58:28 +00:00
KMY
bfc7b0101d Merge remote-tracking branch 'parent/main' into upstream-20231110 2023-11-10 09:02:03 +09:00
Matt Jankowski
548bb30b2a
Consolidate html page title output logic into helper (#27563) 2023-11-09 13:05:57 +00:00
Matt Jankowski
c9204b792c
Fix Rails/I18nLocaleTexts cop (#27779) 2023-11-09 09:46:39 +00:00
KMY
08f86bcb8f Merge commit '389a6cc4c0' into upstream-20231108 2023-11-08 10:41:10 +09:00
Matt Jankowski
49e2772064
Fix RSpec/MessageSpies cop (#27751) 2023-11-07 09:46:28 +00:00
Matt Jankowski
b06284c572
Fix RSpec/HookArgument cop (#27747) 2023-11-07 09:10:36 +00:00
KMY
64578feeb4 Merge remote-tracking branch 'parent/main' into upstream-20231107 2023-11-07 11:35:05 +09:00
Matt Jankowski
d6f50839e1
Fix RSpec/SpecFilePathFormat cops (#27730) 2023-11-06 16:25:40 +00:00
Matt Jankowski
949f5eb860
Fix RSpec/MetadataStyle cop in spec/ (#27729) 2023-11-06 14:28:20 +00:00
KMY
f9eaaec4e7 Merge remote-tracking branch 'parent/main' into upstream-20231021 2023-10-21 10:32:06 +09:00
Matt Jankowski
9f218c9924
Refactor appeal partial to avoid brakeman XSS warning (#25880) 2023-10-19 17:25:54 +02:00
Matt Jankowski
bcd0171e5e
Fix Lint/UselessAssignment cop (#27472) 2023-10-19 16:55:06 +02:00
KMY
3ccf0d02c6 Merge remote-tracking branch 'parent/main' into kb_development 2023-10-07 09:19:36 +09:00
gunchleoc
68ec1d180a
Fix language sorting in settings (#27158) 2023-10-04 09:23:50 +02:00
KMY
a2d4a9295d Allow jsonld array contains null value 2023-09-20 08:17:51 +09:00
Nick Schonning
b970ed6098
Update rubocop and rubocop-rspec (#26329) 2023-08-22 09:31:40 +02:00
Matt Jankowski
6f1fa1364f
Fix RSpec/EmptyExampleGroup cop (#24735) 2023-07-28 23:15:33 +02:00
Matt Jankowski
6edd404482
Cleanup unused portions of statuses/status partial (#26045) 2023-07-19 08:44:16 +02:00
Matt Jankowski
6c5a2233a8
Fix RSpec/StubbedMock cop (#25552)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-07-12 10:20:10 +02:00