summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorPeter Kozak <spag@golwen.net>2013-03-11 02:43:51 -0400
committerPeter Kozak <spag@golwen.net>2013-03-11 02:43:51 -0400
commit436368d7719a9447c5c09dc6f8b24a623b48f3b6 (patch)
treec288f4c91d7937303f5f2553c60aa16062bcab73 /Gemfile
parent0c5c2bc651bc701117d376a68905cb7d2f913449 (diff)
parentbeb9e66a5b4e2744435f2c1f301828b68a58c96a (diff)
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile5
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'