diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-09 17:28:33 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-02-09 17:28:33 +0100 |
| commit | 322e907e0417da482789e4d24263f247f29a5769 (patch) | |
| tree | 8356833bbbf82de571feb1d739e0db7e2a50c9be /app/models/account_suggestions | |
| parent | 8987ea4d6b236657b8ea97d619902668768ae8ff (diff) | |
| parent | 3aebe711fd54d75c1ea35e65a5dc342e78508d15 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Upstream renamed some helper functions that were used in a part of the settings page which glitch-soc slightly changed the layout of. Ported the change.
Diffstat (limited to 'app/models/account_suggestions')
| -rw-r--r-- | app/models/account_suggestions/global_source.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/account_suggestions/global_source.rb b/app/models/account_suggestions/global_source.rb index 03ed1b6c2..7bca530d4 100644 --- a/app/models/account_suggestions/global_source.rb +++ b/app/models/account_suggestions/global_source.rb @@ -6,7 +6,7 @@ class AccountSuggestions::GlobalSource < AccountSuggestions::Source end def get(account, skip_account_ids: [], limit: 40) - account_ids = account_ids_for_locale(I18n.locale.to_str.split(/[_-]/).first) - [account.id] - skip_account_ids + account_ids = account_ids_for_locale(I18n.locale.to_s.split(/[_-]/).first) - [account.id] - skip_account_ids as_ordered_suggestions( scope(account).where(id: account_ids), |