From 964c81fc615b35c9ee909a47901f307be6ce2c3a Mon Sep 17 00:00:00 2001 From: "Mario \"Kuroir\" Ricalde" Date: Wed, 13 Feb 2013 04:10:53 -0600 Subject: Update simple_form to 2.1. The reason for this is that, after doing some research, it seems that TB is not completely supported out of the box by the older versions, making it hard for me to implement some needed things. --- Gemfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index b390a28..c90adb5 100644 --- a/Gemfile +++ b/Gemfile @@ -49,8 +49,7 @@ group :test do end gem "haml" -gem "simple_form", '2.0.1' - +gem "simple_form", github: 'plataformatec/simple_form', branch: 'v2.1' # Image Upload gem 'carrierwave' gem "mini_magick" -- cgit v1.2.3 From 24e085ddcc30b8d6acec7dde8b165e105da5f004 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Wed, 13 Feb 2013 14:14:57 +0100 Subject: Updated Rails to 3.2.12 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index c90adb5..ca49e69 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '3.2.11' +gem 'rails', '3.2.12' gem 'bcrypt-ruby' gem 'sqlite3' gem 'mysql2' -- cgit v1.2.3 From 012d68aec79e14b331d5a76bb6a058ebf280cdf0 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Wed, 13 Feb 2013 18:00:53 +0100 Subject: nothing --- Gemfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index ca49e69..9a2851a 100644 --- a/Gemfile +++ b/Gemfile @@ -48,8 +48,9 @@ group :test do gem 'factory_girl_rails' end -gem "haml" -gem "simple_form", github: 'plataformatec/simple_form', branch: 'v2.1' +gem 'haml' +gem 'simple_form', github: 'plataformatec/simple_form', branch: 'v2.1' + # Image Upload gem 'carrierwave' gem "mini_magick" -- cgit v1.2.3 From 0240e6dd67bc87bc36f6fcdc964bd8e55895b52d Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Wed, 13 Feb 2013 18:04:10 +0100 Subject: Downgraded simple_form because of #175 --- Gemfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 9a2851a..aa66bda 100644 --- a/Gemfile +++ b/Gemfile @@ -49,7 +49,8 @@ group :test do end gem 'haml' -gem 'simple_form', github: 'plataformatec/simple_form', branch: 'v2.1' +gem 'simple_form', '~> 2.0.1' +# gem 'simple_form', github: 'plataformatec/simple_form', branch: 'v2.1' # Image Upload gem 'carrierwave' -- cgit v1.2.3 From a9bf3a7e1fd802025824668e477a5ec14ce81d5a Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Wed, 13 Feb 2013 18:09:15 +0100 Subject: Encoding.default_external = Encoding::UTF_8 --- Gemfile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index aa66bda..e4e839f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,8 @@ +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.12' @@ -49,8 +54,8 @@ 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.0.1' +gem 'simple_form', github: 'plataformatec/simple_form', branch: 'v2.1' # Image Upload gem 'carrierwave' -- cgit v1.2.3