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.lock | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 8491109..6f4888b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,12 @@ +GIT + remote: git://github.com/plataformatec/simple_form.git + revision: e3da7301dcf6feb9a1db275ff5cb3f85afce0e80 + branch: v2.1 + specs: + simple_form (2.1.0.dev) + actionpack (~> 3.0) + activemodel (~> 3.0) + GEM remote: http://rubygems.org/ specs: @@ -141,9 +150,6 @@ GEM sextant (0.2.3) activesupport (>= 3.2) rails (>= 3.2) - simple_form (2.0.1) - actionpack (~> 3.0) - activemodel (~> 3.0) sprockets (2.2.2) hike (~> 1.2) multi_json (~> 1.0) @@ -214,7 +220,7 @@ DEPENDENCIES rails (= 3.2.11) sass-rails sextant - simple_form (= 2.0.1) + simple_form! sqlite3 state_machine strong_parameters -- 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.lock | 59 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 29 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 6f4888b..d8531cd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,31 +10,31 @@ GIT GEM remote: http://rubygems.org/ specs: - actionmailer (3.2.11) - actionpack (= 3.2.11) + actionmailer (3.2.12) + actionpack (= 3.2.12) mail (~> 2.4.4) - actionpack (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) + actionpack (3.2.12) + activemodel (= 3.2.12) + activesupport (= 3.2.12) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) - rack (~> 1.4.0) + rack (~> 1.4.5) rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.11) - activesupport (= 3.2.11) + activemodel (3.2.12) + activesupport (= 3.2.12) builder (~> 3.0.0) - activerecord (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) + activerecord (3.2.12) + activemodel (= 3.2.12) + activesupport (= 3.2.12) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) - activesupport (3.2.11) + activeresource (3.2.12) + activemodel (= 3.2.12) + activesupport (= 3.2.12) + activesupport (3.2.12) i18n (~> 0.6) multi_json (~> 1.0) acts_as_list (0.1.9) @@ -75,7 +75,7 @@ GEM dalli (2.6.2) delayed_job (3.0.5) activesupport (~> 3.0) - delayed_job_active_record (0.4.0) + delayed_job_active_record (0.4.1) activerecord (>= 2.1.0, < 4) delayed_job (~> 3.0) erubis (2.7.0) @@ -88,7 +88,8 @@ GEM factory_girl (~> 4.2.0) railties (>= 3.0.0) fssm (0.2.10) - haml (3.1.7) + haml (4.0.0) + tilt hike (1.2.1) hirb (0.7.1) http_accept_language (1.0.2) @@ -109,7 +110,7 @@ GEM mime-types (1.21) mini_magick (3.4) subexec (~> 0.2.1) - multi_json (1.5.1) + multi_json (1.6.0) mysql2 (0.3.11) nokogiri (1.5.6) open4 (1.3.0) @@ -123,17 +124,17 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.11) - actionmailer (= 3.2.11) - actionpack (= 3.2.11) - activerecord (= 3.2.11) - activeresource (= 3.2.11) - activesupport (= 3.2.11) + rails (3.2.12) + actionmailer (= 3.2.12) + actionpack (= 3.2.12) + activerecord (= 3.2.12) + activeresource (= 3.2.12) + activesupport (= 3.2.12) bundler (~> 1.0) - railties (= 3.2.11) - railties (3.2.11) - actionpack (= 3.2.11) - activesupport (= 3.2.11) + railties (= 3.2.12) + railties (3.2.12) + actionpack (= 3.2.12) + activesupport (= 3.2.12) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -217,7 +218,7 @@ DEPENDENCIES mysql2 nokogiri quiet_assets - rails (= 3.2.11) + rails (= 3.2.12) sass-rails sextant simple_form! -- 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.lock | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index d8531cd..769b1bf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,3 @@ -GIT - remote: git://github.com/plataformatec/simple_form.git - revision: e3da7301dcf6feb9a1db275ff5cb3f85afce0e80 - branch: v2.1 - specs: - simple_form (2.1.0.dev) - actionpack (~> 3.0) - activemodel (~> 3.0) - GEM remote: http://rubygems.org/ specs: @@ -151,6 +142,9 @@ GEM sextant (0.2.3) activesupport (>= 3.2) rails (>= 3.2) + simple_form (2.0.4) + actionpack (~> 3.0) + activemodel (~> 3.0) sprockets (2.2.2) hike (~> 1.2) multi_json (~> 1.0) @@ -221,7 +215,7 @@ DEPENDENCIES rails (= 3.2.12) sass-rails sextant - simple_form! + simple_form (~> 2.0.1) sqlite3 state_machine strong_parameters -- 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.lock | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 769b1bf..d8531cd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,12 @@ +GIT + remote: git://github.com/plataformatec/simple_form.git + revision: e3da7301dcf6feb9a1db275ff5cb3f85afce0e80 + branch: v2.1 + specs: + simple_form (2.1.0.dev) + actionpack (~> 3.0) + activemodel (~> 3.0) + GEM remote: http://rubygems.org/ specs: @@ -142,9 +151,6 @@ GEM sextant (0.2.3) activesupport (>= 3.2) rails (>= 3.2) - simple_form (2.0.4) - actionpack (~> 3.0) - activemodel (~> 3.0) sprockets (2.2.2) hike (~> 1.2) multi_json (~> 1.0) @@ -215,7 +221,7 @@ DEPENDENCIES rails (= 3.2.12) sass-rails sextant - simple_form (~> 2.0.1) + simple_form! sqlite3 state_machine strong_parameters -- cgit v1.2.3