mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
06e637fc4a
* 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 |
||
|---|---|---|
| .. | ||
| cloud/cloud66 | ||
| environments | ||
| initializers | ||
| locales | ||
| application.rb | ||
| boot.rb | ||
| cdn.yml.sample | ||
| database.yml | ||
| deploy.rb.sample | ||
| discourse_defaults.conf | ||
| discourse.config.sample | ||
| discourse.pill.sample | ||
| environment.rb | ||
| logrotate.conf | ||
| multisite.yml.production-sample | ||
| nginx.global.conf | ||
| nginx.sample.conf | ||
| projections.json | ||
| puma.rb | ||
| routes.rb | ||
| site_settings.yml | ||
| spring.rb | ||
| thin.yml.sample | ||
| unicorn_launcher | ||
| unicorn_upstart.conf | ||
| unicorn.conf.rb | ||