]> cat aescling's git repositories - mastodon.git/commit
cat aescling's git repositories / mastodon.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 91c7147) | patch
Fix merge default columns (#3748)
authorunarist <m.unarist@gmail.com>
Wed, 14 Jun 2017 19:59:52 +0000 (04:59 +0900)
committerEugen Rochko <eugen@zeonfederated.com>
Wed, 14 Jun 2017 19:59:52 +0000 (21:59 +0200)
commitd8a0ee1956e291e88a33425eb504d36c85fc3a3f
tree9feae6039eea5286394346cfdb0fe96e15c7bc65tree | snapshot
parent91c71471ab41bb9af673daf6dde50159d0bfde18commit | diff
Fix merge default columns (#3748)

mergeDeep also merges columns, but it should be replaced simply.

So in the new function, first apply mergeDeep except columns, and set default columns if columns unset.
app/javascript/mastodon/reducers/settings.js diff | blob | history
source code fur Kibicat Mastodon