Khoa, Le Ngoc 06e637fc4a Merge remote-tracking branch 'upstream/master' into update-locale-vietnamese ... * upstream/master: (185 commits) SECURITY: Upgrade rails. FIX: new user summary page was broken Version bump to v1.5.0.beta9 Remove addressable from Discourse. UX: change glyph when inviting existing user to a topic FIX: Allow for large free disk space Revert "FIX: disk_space should be a BigDecimal to handle large disk (closes #3923)" UX: improve styling of messages and mobile view of messages FIX: correct counts on user summary FIX: link to filtered down list of badges from summary FEATURE: pick featured badges in summary page FIX: do not allow new email to be duplicate FIX: return proper error message when email already exists retain unactivated accounts a bit longer default FEATURE: blocked users can send and reply to private messages from staff Remove Arel patch that has been merged upstream. correct path little typo FIX: Missing tag in CSS. PERF: remove 10-20ms of work from every page view FIX: remove green background for wiki (this can be re-added via a customization if needed) Hotfix for unsubscribe via email ... # Conflicts: # .tx/config		2016-01-26 12:44:29 +07:00
..
locales	Merge remote-tracking branch 'upstream/master' into update-locale-vietnamese	2016-01-26 12:44:29 +07:00
settings.yml	FIX: disable poll dialect when poll plugin is disabled	2015-09-14 20:11:03 +02:00