monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,344 Commits 1 Branch 0 Tags 261 MiB
Commit Graph

20344 Commits

Author SHA1 Message Date
Claire e76b7ebe89
Merge pull request #2563 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 2954279e9c
 2024-01-12 13:19:14 +01:00
Claire 15bc13c65b Merge commit '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream 2024-01-11 20:15:19 +01:00
Claire cbc951627c
Merge pull request #2562 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 0a7cff53c2
 2024-01-11 18:41:33 +01:00
Matt Jankowski 2954279e9c
Remove double subject call in `api/v1/admin/trends/links/links` spec (#28695) 2024-01-11 15:13:11 +00:00
Matt Jankowski 95bd46d32a
Remove double subject call in `api/v1/admin/ip_blocks` spec (#28696) 2024-01-11 15:11:57 +00:00
Matt Jankowski b68f185573
Reduce `LineLength` for `react_component` helper in views/admin (#28694) 2024-01-11 13:14:24 +00:00
renovate[bot] 782a0165c7
Update dependency node to 20.11 (#28670) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-11 12:48:01 +00:00
Claire 08304075be Fix old glitch-soc migration using removed `add_column_with_default` helper 2024-01-11 13:26:17 +01: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
Claire b523188807
Merge pull request #2559 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 5dc634796a
 2024-01-11 12:08:56 +01:00
Matt Jankowski 3f3df9ab20
Update omniauth-cas to version 3.0.0 (#28683) 2024-01-11 10:57:52 +00:00
Matt Jankowski 4e08a4892f
Move streaming `around` config into manager class (#28684) 2024-01-11 10:54:42 +00: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
Matt Jankowski 0a7cff53c2
Add coverage for `Account.followable_by` scope (#28689) 2024-01-11 09:30:29 +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 2c70ca0674 Increase Metrics/AbcSize limit 2024-01-10 18:03:31 +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 8422b8ded0
Extract capybara config and improve headless_chrome driver config (#28681) 2024-01-10 14:54:11 +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 00341c70ff
Use Sidekiq `fake!` instead of `inline!` in specs (#25369) 2024-01-10 11:06:58 +00:00
Matt Jankowski ea1c0feb86
Remove `add_column_with_default` migration helper (#28654) 2024-01-10 10:35:06 +00:00
zunda 36b46ea3b5
bundle add csv (#28671) 2024-01-10 09:37:31 +00:00
Matt Jankowski 742d8d30e2
Add coverage for `--days` option to CLI `media refresh` command (#28669) 2024-01-10 09:36:12 +00:00
Matt Jankowski a71e918e95
Fix `LineLength` haml-lint in `media/player` view (#28667) 2024-01-10 09:35:01 +00:00
Renaud Chaput 63d0b52cf3
Add a system spec for the `/share` endpoint (#28672) 2024-01-09 21:58:19 +00:00
renovate[bot] 1f44903991
Update dependency sidekiq-unique-jobs to v7.1.31 (#27818) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-09 21:08:02 +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
renovate[bot] 9a73a7dcaf
Update dependency irb to v1.11.1 (#28662) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-09 15:17:18 +00:00
renovate[bot] 93938751eb
Update dependency ruby-prof to v1.7.0 (#28637) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-09 14:40:24 +00:00
Claire 10203bd57a
Clean up `Setting` model and remove dead code (#28661) 2024-01-09 14:01:53 +00:00
Matt Jankowski 4e02838832
Enable "low risk" Rails 7.1 setting defaults (#28626) 2024-01-09 12:50:57 +00:00
renovate[bot] 1ad908e0c0
Update dependency fog-core to v2.4.0 (#28582) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-09 12:06:19 +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
github-actions[bot] 01ca84e541
New Crowdin Translations (automated) (#28660) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-09 11:48:19 +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 5dc634796a
Misc coverage improvements re: sidekiq/inline (#28651) 2024-01-09 09:40:08 +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