diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-04-21 13:52:03 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-04-21 13:52:03 +0200 |
| commit | 536892b8ae7788525e9d65481df693afe6a8bfc4 (patch) | |
| tree | 601261c5ef16225420743f32ae2ec4ce40ceb098 /app/javascript/mastodon | |
| parent | b1d4f21db0d413c887978ff69aa46b3bc8ea1f3d (diff) | |
| parent | 0b36e3419d4c4ce175f9db266ef5b3a49a9b3974 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/javascript/mastodon')
| -rw-r--r-- | app/javascript/mastodon/actions/suggestions.js | 2 | ||||
| -rw-r--r-- | app/javascript/mastodon/features/ui/components/columns_area.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/mastodon/actions/suggestions.js b/app/javascript/mastodon/actions/suggestions.js index e3a549759..1f1116e75 100644 --- a/app/javascript/mastodon/actions/suggestions.js +++ b/app/javascript/mastodon/actions/suggestions.js @@ -12,7 +12,7 @@ export function fetchSuggestions(withRelationships = false) { return (dispatch, getState) => { dispatch(fetchSuggestionsRequest()); - api(getState).get('/api/v2/suggestions').then(response => { + api(getState).get('/api/v2/suggestions', { params: { limit: 20 } }).then(response => { dispatch(importFetchedAccounts(response.data.map(x => x.account))); dispatch(fetchSuggestionsSuccess(response.data)); diff --git a/app/javascript/mastodon/features/ui/components/columns_area.js b/app/javascript/mastodon/features/ui/components/columns_area.js index 270be2851..039abe432 100644 --- a/app/javascript/mastodon/features/ui/components/columns_area.js +++ b/app/javascript/mastodon/features/ui/components/columns_area.js @@ -53,7 +53,7 @@ const messages = defineMessages({ publish: { id: 'compose_form.publish', defaultMessage: 'Toot' }, }); -const shouldHideFAB = path => path.match(/^\/statuses\/|^\/search|^\/getting-started/); +const shouldHideFAB = path => path.match(/^\/statuses\/|^\/search|^\/getting-started|^\/start/); export default @(component => injectIntl(component, { withRef: true })) class ColumnsArea extends ImmutablePureComponent { |