mastodon/app
unarist d8a0ee1956 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.
2017-06-14 21:59:52 +02:00
..
controllers Fix account delete form not accepting password, update suspended (#3745) 2017-06-14 20:30:12 +02:00
helpers Improve RTL detection (#3682) 2017-06-10 15:06:50 +02:00
javascript Fix merge default columns (#3748) 2017-06-14 21:59:52 +02:00
lib Language detection defaults to nil (#3666) 2017-06-09 18:09:37 +02:00
mailers Remove unnecessary .keep files (#2976) 2017-05-11 01:45:42 +02:00
models Account deletion (#3728) 2017-06-14 18:01:27 +02:00
policies Add status destroy authorization to policy (#3453) 2017-05-30 22:56:31 +02:00
presenters Bump version, improve how version is stored for better commit history (#2526) 2017-04-27 15:22:19 +02:00
services Fix account delete form not accepting password, update suspended (#3745) 2017-06-14 20:30:12 +02:00
validators Correct validators so that existing error messages would look correct (#3668) 2017-06-09 19:46:01 +02:00
views Account deletion (#3728) 2017-06-14 18:01:27 +02:00
workers Batched remove status service (#3735) 2017-06-14 18:01:35 +02:00