me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
20354 commits 2 branches 0 tags 429 MiB
Commit graph

12342 commits

Author SHA1 Message Date
Claire
a3b6a85521 Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream 
Conflicts:
- `.prettierignore`:
  Conflict due to glitch-soc-only files.
  Kept those at the end of the file.
 2024-01-13 12:11:29 +01:00
Matt Jankowski
575ab085be
Disable Rails/ApplicationController for HealthController (#28705) 2024-01-12 09:08:17 +00:00
Renaud Chaput
383be173af
Add a version comment to the emoji preval-ed file so it is regenerated (#28700) 2024-01-12 03:39:11 +00:00
Claire
15bc13c65b Merge commit '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream 2024-01-11 20:15:19 +01:00
Essem
b6e353537b
Add new emojis from jdecked/twemoji 15.0 (#28404) 2024-01-11 16:15:08 +00:00
Matt Jankowski
b68f185573
Reduce LineLength for react_component helper in views/admin (#28694) 2024-01-11 13:14:24 +00:00
Claire
23d8bd8ce1 Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream 2024-01-11 13:24:20 +01:00
Claire
5dcb8d92c3 Fix lint issue in glitch-soc-only setting form 2024-01-11 13:22:39 +01:00
Claire
63acdebc5d Merge commit '36b46ea3b5b4a4fb51cf1cd103b5a3c1103c300e' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict because of a code style fix, while some changed lines are
  absent from glitch-soc.
  Ignored the deleted lines.
 2024-01-11 13:17:13 +01:00
Claire
630b245bb4 Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/settings/scoped_settings.rb`:
  Removed upstream, while glitch-soc had a change related to its theming system.
  Removed as well, as it's unused.
 2024-01-11 12:59:27 +01:00
github-actions[bot]
e5b97eadd5
New Crowdin Translations (automated) (#2502) 
* New Crowdin translations

* Update no.yml

* Update simple_form.no.yml

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-11 12:56:56 +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
github-actions[bot]
204bbf49d2
New Crowdin Translations (automated) (#28692) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-11 10:08:49 +00:00
Matt Jankowski
6daa69327b
Fix LineLength haml-lint in t usage (#28686) 2024-01-11 09:32:32 +00:00
Claire
47d213e701 Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream 2024-01-10 18:41:04 +01:00
Renaud Chaput
09376a8207 [Glitch] Upgrade Redux packages 
Port a0e237a96f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-10 18:34:23 +01:00
Claire
51d2d98174 Merge commit 'a0e237a96fca2774d3c9ed43063a45e395bb7f40' into glitch-soc/merge-upstream 2024-01-10 18:26:47 +01:00
Claire
7cd88ae2f4 [Glitch] Fix scrolling to detailed status not always working 
Port d0fd14f851 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-10 18:02:37 +01:00
Claire
0b2c7cdb02 Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/content_security_policy.rb`:
  Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS`
  environment variable.
  Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.
 2024-01-10 17:51:12 +01:00
Claire
d7e13e2483
Fix potential redirection loop of streaming endpoint (#28665) 2024-01-10 15:05:46 +00:00
Matt Jankowski
543d7890fd
Use normalizes to prepare User values (#28650) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-10 13:36:06 +00:00
Matt Jankowski
a71e918e95
Fix LineLength haml-lint in media/player view (#28667) 2024-01-10 09:35:01 +00:00
Matt Jankowski
eed4eef39a
Fix LineLength haml-lint in app/views/auth area (#28664) 2024-01-09 16:03:16 +00:00
Matt Jankowski
09ab073f0c
Fix LineLength haml-lint in app/views/settings area (#28663) 2024-01-09 15:28:56 +00:00
Claire
10203bd57a
Clean up Setting model and remove dead code (#28661) 2024-01-09 14:01:53 +00:00
Jean Boussier
1781849884
Inline what remains of the rails-settings-cached gem (#28618) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-09 11:50:21 +00:00
gunchleoc
173953c23e
Fix ISO code for Canadian French (#26015) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-09 10:56:13 +00:00
Matt Jankowski
68f06f1fd4
Fix haml-lint LineLength cop for settings/preferences/notifications/show (#28655) 2024-01-09 09:31:32 +00:00
github-actions[bot]
8e7d5fe2ac
New Crowdin Translations (automated) (#28658) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-09 09:30:33 +00:00
Matt Jankowski
cd4b4d4734
Replace unused by_recent_sign_in scope (#28616) 2024-01-08 15:31:13 +00:00
Matt Jankowski
e677eb164c
Remove unused Announcement#time_range? (#28648) 2024-01-08 15:26:30 +00:00
Matt Jankowski
3e43cd095c
Remove unused scope Announcement.without_muted (#28645) 2024-01-08 15:26:14 +00:00
Matt Jankowski
9322396e58
Use normalizes to prepare Account#username value (#28646) 2024-01-08 13:48:31 +00:00
Matt Jankowski
cd58e37b25
Remove unused DomainBlock#affected_accounts_count method (#28642) 2024-01-08 13:38:52 +00:00
Matt Jankowski
3e7a9266ea
Remove unused EmojiFormatter#count_tag_nesting method (#28643) 2024-01-08 13:36:47 +00:00
Matt Jankowski
4ccba94489
Remove unused *_silenced_accounts scopes on Status (#28644) 2024-01-08 13:35:53 +00:00
Matt Jankowski
c52a593a30
Remove unused scope User.emailable (#28647) 2024-01-08 13:33:45 +00:00
Matt Jankowski
e827c4692c
Use Arel matches method in CustomEmoji search (#28615) 2024-01-08 13:26:12 +00:00
github-actions[bot]
cc67943df2
New Crowdin Translations (automated) (#28627) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-08 12:46:25 +00:00
Matt Jankowski
1bc5a52139
Extract SQL heredoc method for Announcement scopes (#28613) 2024-01-08 11:22:16 +00:00
Matt Jankowski
aa6d07dbd9
Use normalizes to prepare CustomEmoji domain value (#28624) 2024-01-08 11:20:59 +00:00
Matt Jankowski
202951e6d9
Use Arel in_order_of method to generate CASE for DomainBlock.by_severity (#28617) 2024-01-08 11:15:36 +00:00
Matt Jankowski
57f49c8191
Use Arel nulls_first method in ordering CustomEmojiFilter scope (#28614) 2024-01-08 11:09:50 +00:00
Renaud Chaput
a0e237a96f
Upgrade Redux packages (#28585) 2024-01-08 10:57:40 +00:00
Jean Boussier
5a6d533c53
Enable Rails 7.1 Marshalling format (#28609) 2024-01-05 21:57:47 +00:00
Matt Jankowski
12bed81187
Add validation specs to CustomFilter model (#28600) 2024-01-05 15:13:59 +00:00
github-actions[bot]
43d800ada6
New Crowdin Translations (automated) (#28604) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-05 11:29:19 +00:00
Claire
6ad0fb5a77
Fix NULL MX handling and tighten DNS resolving specs (#28607) 2024-01-05 11:07:57 +00:00
Claire
5f4643b895
Add PAPERCLIP_ROOT_URL to Content-Security-Policy when used (#28561) 2024-01-05 10:45:36 +00:00