Merge pull request #1319 from scott/dev/2.5/prepare-2.5.0

prepare 2.5 release

Author: scott

CHANGELOG.md

@@ -1,3 +1,17 @@
+## VERSION 2.5.0
+
+This release adds important new functionality for managing incoming spam email tickets (particularly from parse webhook services such as Sendgrid or Mandrill). 
+Two new settings have been added that use the spam assassin score provided by these providers to either block tickets outright, or filter them to the spam
+folder. In addition, dependencies have been upgraded.
+
+- Expose trash and Spam tickets navigation in the left ticketing nav
+- Adds two settings to adjust how Helpy filters spam (when using Sendgrid, Mandrill, etc.)
+- Stores the spam score of incoming emails in the Topic table
+- Adds the ability to do bulk actions on *all* tickets matching a search
+- Adds the option to "empty the trash", permanently deleting all messages in the trash
+
+See UPDATING.md for details on how to update.
+
 ## VERSION 2.4.3
 
 This release fixes a bug in the way autosaving was handled. 

UPDATING.md

@@ -0,0 +1,37 @@
+## UPDATING HELPY
+
+In the default monolithic configuration, Helpy is a fairly standard Ruby on Rails app.  Updating to a new version requires several steps.  There are two main places you might want to get updates from:
+
+1. The `master` branch, which is generally stable but is where most dev work happens and should be considered to be an *edge* version.  If you want to get the latest bleeding edge updates, pull from `master`
+2. The release branches.  Here you can use the `release/stable` or specific version updates: ie `release/2.4.2` or `release/2.5.0`
+
+Updating the community edition:
+
+Whether you run the open source community edition or the cloud edition, start by updating the base app:
+
+1. Get the latest version:
+`git pull`
+
+2. Update bundled gems:
+`bundle install`
+
+3. Run any new migrations, and update the assets:
+`RAILS_ENV=production bundle exec rake db:migrate`
+`RAILS_ENV=production bundle exec rake assets:precompile`
+
+4. Restart the webserver.
+
+### Cloud Edition 
+
+If you are running the cloud edition, perform the following additional steps:
+
+1. Update the cloud gem.  The major version should match the Helpy core major version.
+`bundle update helpy_cloud`
+
+2. Run the cloud installer:
+`rails g helpy_cloud:install`
+
+3. Update assets:
+`RAILS_ENV=production bundle exec rake assets:precompile`
+
+4. Restart webserver

config/environment.rb

@@ -5,6 +5,6 @@
 Rails.application.initialize!
 
 # Get the current tag version
-VERSION = '2.4.3'
+VERSION = '2.5.0'
 REVISION = `git log --pretty=format:'%h' -n 1`
 APP_VERSION = "#{VERSION}:#{REVISION}"