Merge branch 'develop' of github.com:amooma/GS5 into develop

1 files changed, 3 insertions, 2 deletions

diff --git a/Gemfile b/Gemfile
index e4e839f..be5ab7c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -54,8 +54,7 @@ group :test do
 end
 
 gem 'haml'
-# gem 'simple_form', '~> 2.0.1'
-gem 'simple_form', github: 'plataformatec/simple_form', branch: 'v2.1'
+gem 'simple_form', '~> 2.1.0'
 
 # Image Upload
 gem 'carrierwave'
@@ -80,7 +79,9 @@ gem 'uuid'
 # Application server
 gem 'unicorn'
 
+# http://railscasts.com/episodes/316-private-pub
 gem 'thin'
+gem 'private_pub'
 
 # Backup https://github.com/meskyanichi/backup
 gem 'backup'