diff options
author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-03-25 10:27:27 +0100 |
---|---|---|
committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-03-25 10:27:27 +0100 |
commit | df6e17e48995f25e72509986f30700d778b179b6 (patch) | |
tree | f432c24b8e4ad81009188650dabfd99194883265 /Gemfile | |
parent | 11f186a118285fbc87a536af26730780a9ad01f5 (diff) | |
parent | cce94a74aa5c9691f9b37cd9be5a6831f8063812 (diff) |
Merge branch 'develop'5.1.2
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -5,7 +5,7 @@ end source 'http://rubygems.org' -gem 'rails', '3.2.12' +gem 'rails', '3.2.13' gem 'bcrypt-ruby' gem 'sqlite3' gem 'mysql2' @@ -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' @@ -88,6 +89,8 @@ gem 'backup' # Cronjobs gem 'whenever' +gem 'whois' + # Local Variables: # mode: ruby # End: |