* 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
Since rspec-rails 3, the default installation creates two helper files:
* `spec_helper.rb`
* `rails_helper.rb`
`spec_helper.rb` is intended as a way of running specs that do not
require Rails, whereas `rails_helper.rb` loads Rails (as Discourse's
current `spec_helper.rb` does).
For more information:
https://www.relishapp.com/rspec/rspec-rails/docs/upgrade#default-helper-files
In this commit, I've simply replaced all instances of `spec_helper` with
`rails_helper`, and renamed the original `spec_helper.rb`.
This brings the Discourse project closer to the standard usage of RSpec
in a Rails app.
At present, every spec relies on loading Rails, but there are likely
many that don't need to. In a future pull request, I hope to introduce a
separate, minimal `spec_helper.rb` which can be used in tests which
don't rely on Rails.
Arpit Jalan
Manel Villar
Régis Hanol
Neil Lalonde
Robin Ward
Sam
Khoa, Le Ngoc
root
Jeff Atwood
Gerhard Schlager
Andy Waite