diff --git a/Gemfile.lock b/Gemfile.lock index 758c911..9239f9c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.8) - actionpack (= 3.2.8) + actionmailer (3.2.7) + actionpack (= 3.2.7) mail (~> 2.4.4) - actionpack (3.2.8) - activemodel (= 3.2.8) - activesupport (= 3.2.8) + actionpack (3.2.7) + activemodel (= 3.2.7) + activesupport (= 3.2.7) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -14,18 +14,18 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.1.3) - activemodel (3.2.8) - activesupport (= 3.2.8) + activemodel (3.2.7) + activesupport (= 3.2.7) builder (~> 3.0.0) - activerecord (3.2.8) - activemodel (= 3.2.8) - activesupport (= 3.2.8) + activerecord (3.2.7) + activemodel (= 3.2.7) + activesupport (= 3.2.7) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.8) - activemodel (= 3.2.8) - activesupport (= 3.2.8) - activesupport (3.2.8) + activeresource (3.2.7) + activemodel (= 3.2.7) + activesupport (= 3.2.7) + activesupport (3.2.7) i18n (~> 0.6) multi_json (~> 1.0) arel (3.0.2) @@ -40,22 +40,23 @@ GEM erubis (2.7.0) execjs (1.4.0) multi_json (~> 1.0) - formtastic (2.1.1) - actionpack (~> 3.0) + formtastic (2.2.1) + actionpack (>= 3.0) haml (3.1.7) hike (1.2.1) i18n (0.6.0) journey (1.0.4) - jquery-rails (2.0.2) - railties (>= 3.2.0, < 5.0) + jquery-rails (2.1.1) + railties (>= 3.1.0, < 5.0) thor (~> 0.14) - json (1.7.4) + json (1.7.5) mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.19) multi_json (1.3.6) + mysql2 (0.3.11) polyglot (0.3.3) rack (1.4.1) rack-cache (1.2) @@ -64,17 +65,17 @@ GEM rack rack-test (0.6.1) rack (>= 1.0) - rails (3.2.8) - actionmailer (= 3.2.8) - actionpack (= 3.2.8) - activerecord (= 3.2.8) - activeresource (= 3.2.8) - activesupport (= 3.2.8) + rails (3.2.7) + actionmailer (= 3.2.7) + actionpack (= 3.2.7) + activerecord (= 3.2.7) + activeresource (= 3.2.7) + activesupport (= 3.2.7) bundler (~> 1.0) - railties (= 3.2.8) - railties (3.2.8) - actionpack (= 3.2.8) - activesupport (= 3.2.8) + railties (= 3.2.7) + railties (3.2.7) + actionpack (= 3.2.7) + activesupport (= 3.2.7) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -110,7 +111,8 @@ DEPENDENCIES formtastic haml jquery-rails - rails (= 3.2.8) + mysql2 + rails (= 3.2.7) sass-rails (~> 3.2.3) sqlite3 uglifier (>= 1.0.3) diff --git a/app/controllers/survey_sets_controller.rb b/app/controllers/survey_sets_controller.rb index a730c0a..54b7cbd 100644 --- a/app/controllers/survey_sets_controller.rb +++ b/app/controllers/survey_sets_controller.rb @@ -12,7 +12,7 @@ class SurveySetsController < ApplicationController @survey = SurveyType.find_by_slug(params[:slug]) SurveyType.destroy_all - @survey = SurveyType.create(:name => "Votre avis sur les sorties du Pic Vert", :slug => "08-12-avis-sorties", :description => "Ce petit questionnaire nous permettra de mieux connaître vos attentes et de mieux y répondre.") + @survey = SurveyType.create(:name => "Votre avis sur les sorties du Pic Vert", :slug => "08-12-avis-sorties", :description => "Ce petit questionnaire nous permettra de mieux connaître vos attentes et de mieux y répondre.") @survey.items.build(:questions_type => 1, :title => "Avez-vous déjà participé à une sortie organisée par Le Pic Vert ?", :item_type => 1)