mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2025-01-02 20:03:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix vanilla flavor being broken due to incorrect imports

Browse source
This commit is contained in:
Jeremy Kescher 2022-11-06 13:02:47 +01:00
parent c2e83b1354
commit 996267fc8b
No known key found for this signature in database
GPG key ID: 48DFE4BB15BA5940
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/features/compose/components/poll_form.js
View file

@ -7,7 +7,7 @@ import IconButton from 'mastodon/components/icon_button';
import Icon from 'mastodon/components/icon'; import Icon from 'mastodon/components/icon';
import AutosuggestInput from 'mastodon/components/autosuggest_input'; import AutosuggestInput from 'mastodon/components/autosuggest_input';
import classNames from 'classnames'; import classNames from 'classnames';
import { pollLimits } from 'mastodon/initial_state'; import { pollMinOptions } from 'mastodon/initial_state';
const messages = defineMessages({ const messages = defineMessages({
option_placeholder: { id: 'compose_form.poll.option_placeholder', defaultMessage: 'Choice {number}' }, option_placeholder: { id: 'compose_form.poll.option_placeholder', defaultMessage: 'Choice {number}' },

2
app/javascript/mastodon/reducers/compose.js
View file

@ -52,7 +52,7 @@ import { STORE_HYDRATE } from '../actions/store';
import { REDRAFT } from '../actions/statuses'; import { REDRAFT } from '../actions/statuses';
import { Map as ImmutableMap, List as ImmutableList, OrderedSet as ImmutableOrderedSet, fromJS } from 'immutable'; import { Map as ImmutableMap, List as ImmutableList, OrderedSet as ImmutableOrderedSet, fromJS } from 'immutable';
import uuid from '../uuid'; import uuid from '../uuid';
import { me, pollLimits } from '../initial_state'; import { me, pollMinOptions } from '../initial_state';
import { unescapeHTML } from '../utils/html'; import { unescapeHTML } from '../utils/html';
const initialState = ImmutableMap({ const initialState = ImmutableMap({

2
lib/mastodon/version.rb
View file

@ -25,7 +25,7 @@ module Mastodon
end end
def suffix_version def suffix_version
'+1.1.5' '+1.1.6'
end end
def to_a def to_a