diff options
author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-16 11:10:02 +0100 |
---|---|---|
committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-16 11:10:02 +0100 |
commit | 5d8ce5f4775ac8bc5f523964e6e36f63ff3c4683 (patch) | |
tree | 49ed889b1d10cda98c475f3453abff1b97afb4e7 /Gemfile | |
parent | c9066760fd1f5f2f892ce2be5cf2a83bb5210246 (diff) | |
parent | 55784bcffc0678ce6102c0b81447434a8030ebd2 (diff) |
Merge branch 'develop'5.1-beta5
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -1,6 +1,11 @@ +if RUBY_VERSION =~ /1.9/ + Encoding.default_external = Encoding::UTF_8 + Encoding.default_internal = Encoding::UTF_8 +end + source 'http://rubygems.org' -gem 'rails', '3.2.11' +gem 'rails', '3.2.12' gem 'bcrypt-ruby' gem 'sqlite3' gem 'mysql2' @@ -48,8 +53,9 @@ group :test do gem 'factory_girl_rails' end -gem "haml" -gem "simple_form", '2.0.1' +gem 'haml' +# gem 'simple_form', '~> 2.0.1' +gem 'simple_form', github: 'plataformatec/simple_form', branch: 'v2.1' # Image Upload gem 'carrierwave' |