Merge pull request #456 from helpyio/release/1.1.0

prepare for 1.1.0

Gemfile

@@ -186,8 +186,8 @@ group :test do
 end
 
 group :production do
-  gem 'newrelic_rpm'
-  gem 'rails_12factor'
+  # Uncomment this gem for Heroku:
+  # gem 'rails_12factor'
   gem 'unicorn'
 end
 

Gemfile.lock

@@ -334,7 +334,6 @@ GEM
     mustermann19 (0.4.4)
       enumerable-lazy
     netrc (0.11.0)
-    newrelic_rpm (3.15.1.316)
     nokogiri (1.6.8)
       mini_portile2 (~> 2.1.0)
       pkg-config (~> 1.1.7)
@@ -424,11 +423,6 @@ GEM
     rails-timeago (2.13.0)
       actionpack (>= 3.1)
       activesupport (>= 3.1)
-    rails_12factor (0.0.3)
-      rails_serve_static_assets
-      rails_stdout_logging
-    rails_serve_static_assets (0.0.5)
-    rails_stdout_logging (0.0.5)
     railties (4.2.7.1)
       actionpack (= 4.2.7.1)
       activesupport (= 4.2.7.1)
@@ -653,7 +647,6 @@ DEPENDENCIES
   mini_magick
   minitest
   minitest-reporters
-  newrelic_rpm
   nokogiri (>= 1.6.8)
   omniauth
   omniauth-facebook
@@ -671,7 +664,6 @@ DEPENDENCIES
   rails-i18n (~> 4.0.0)
   rails-settings-cached (~> 0.5)
   rails-timeago
-  rails_12factor
   ranked-model
   rdiscount
   recaptcha

HEROKU.md

@@ -0,0 +1,24 @@
+How to install on Heroku
+========================
+
+If you wish to install Helpy on Heroku, there are some changes you will need to
+make, documented here for reference.
+
+1. To start out, clone the repo to you localhost:
+`git clone https://github.com/helpyio/helpy.git`
+
+2. Next, open the `Gemfile` and add the required 12factor gem for Heroku.  You
+can do this by uncommenting the line in the `production` section at the bottom of
+the file:
+
+`gem 'rails_12factor'`
+
+3. From Helpy 1.x onwards, Helpy uses Carrierwave with the filesystem backend for
+file storage.  This is NOT compatible with Heroku, and you will need to add the
+fog gem and specify a cloud storage provider.
+
+You can alternatively configure Helpy to use Cloudinary in the settings UI under
+integrations.
+
+Once you have done these things, you should be able to push to Heroku and your
+site will be live.

README.md

@@ -23,10 +23,10 @@ Helpy is an integrated support solution- combining and leveraging synergies betw
 - **Multi-lingual:** Helpy is fully multi-lingual and can provide support in multiple languages at the same time.  Currently the app includes translations for 19 languages and is easy to translate.
 - **Themeable:** Customize the look and functionality of your Helpy without disturbing the underlying system that makes it all work. Helpy comes with two additional themes, and we hope to add more and get more from the community as time goes on.
 
-Test it Out
+Hosting
 =========
 
-We offer a hosted version of Helpy for businesses that don't want to worry about self installing and maintaining their Helpy.  You can get an instant free trial of the hosted version to see if Helpy is right for you: [Test it Out for Free](https://helpy.io/hosted)
+We offer a hosted version of Helpy for businesses that don't want to worry about self installing and maintaining their Helpy.  You can get an instant free trial of the hosted version to see if Helpy is right for you: [Test it Out for Free](https://goo.gl/Jbrx0m)
 
 Live Demo
 =========
@@ -37,11 +37,8 @@ Admin User: `[email protected]` and password: `12345678`
 Installation
 ============
 
-Helpy was designed to run on on modern cloud providers like Digital Ocean or Heroku, although it should work just about anywhere.  For a quick trial you can get set up on Heroku by clicking this button:
-
-*Heads up!! We are making some improvements that may break some parts of the one-click Heroku installation.  Specifically this includes storing files on the filesystem (not available via Heroku), removing the 12factor gem, using sidekiq and more.  As a result, we no longer recommend the one click Heroku install. Instead, clone the repo, configure it for Heroku and then push to Heroku.*
-
-[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy)
+Helpy was designed to run on on modern cloud providers, although it should work on
+any linux based system.  There is a full guide to installing Helpy at http://support.helpy.io/en/knowledgebase/11-installing-helpy
 
 Requirements are:
 
@@ -55,7 +52,6 @@ Helpy leverages two external services to help out:
 - an email provider like Sendgrid
 - Google Analytics for stats (optional)
 
-There is a full guide to installing Helpy at http://support.helpy.io/en/knowledgebase/11-installing-helpy
 
 Getting Started:
 ----------------

config/environment.rb

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