diff --git a/.gitignore b/.gitignore --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,9 @@ #ignore public assets??? /public/assets +/public + +/data #ignore .orig and .swp *.orig diff --git a/Gemfile b/Gemfile --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '3.2.21' +gem 'rails', '~>3.2' gem 'select2-rails' diff --git a/Gemfile.lock b/Gemfile.lock --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,12 +10,12 @@ remote: https://rubygems.org/ specs: ace-rails-ap (4.0.2) - actionmailer (3.2.21) - actionpack (= 3.2.21) + actionmailer (3.2.22.5) + actionpack (= 3.2.22.5) mail (~> 2.5.4) - actionpack (3.2.21) - activemodel (= 3.2.21) - activesupport (= 3.2.21) + actionpack (3.2.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -23,18 +23,18 @@ rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.21) - activesupport (= 3.2.21) + activemodel (3.2.22.5) + activesupport (= 3.2.22.5) builder (~> 3.0.0) - activerecord (3.2.21) - activemodel (= 3.2.21) - activesupport (= 3.2.21) + activerecord (3.2.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.21) - activemodel (= 3.2.21) - activesupport (= 3.2.21) - activesupport (3.2.21) + activeresource (3.2.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) + activesupport (3.2.22.5) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) arel (3.0.3) @@ -86,44 +86,44 @@ jquery-rails jquery-ui-rails (= 4.0.3) railties (>= 3.1.0) - json (1.8.2) + json (1.8.3) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.25.1) momentjs-rails (2.11.1) railties (>= 3.1) - multi_json (1.10.1) + multi_json (1.12.1) mysql2 (0.3.20) polyglot (0.3.5) power_assert (0.2.2) prototype-rails (3.2.1) rails (~> 3.2) - rack (1.4.5) - rack-cache (1.2) + rack (1.4.7) + rack-cache (1.6.1) rack (>= 0.4) rack-ssl (1.3.4) rack rack-test (0.6.3) rack (>= 1.0) - rails (3.2.21) - actionmailer (= 3.2.21) - actionpack (= 3.2.21) - activerecord (= 3.2.21) - activeresource (= 3.2.21) - activesupport (= 3.2.21) + rails (3.2.22.5) + actionmailer (= 3.2.22.5) + actionpack (= 3.2.22.5) + activerecord (= 3.2.22.5) + activeresource (= 3.2.22.5) + activesupport (= 3.2.22.5) bundler (~> 1.0) - railties (= 3.2.21) + railties (= 3.2.22.5) rails_bootstrap_sortable (2.0.0) momentjs-rails (~> 2, >= 2.8.3) - railties (3.2.21) - actionpack (= 3.2.21) - activesupport (= 3.2.21) + railties (3.2.22.5) + actionpack (= 3.2.22.5) + activesupport (= 3.2.22.5) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.4.2) + rake (11.2.2) rdiscount (2.1.8) rdoc (3.12.2) json (~> 1.4) @@ -162,7 +162,7 @@ treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.43) + tzinfo (0.3.51) uglifier (2.7.0) execjs (>= 0.3.0) json (>= 1.8.0) @@ -192,7 +192,7 @@ momentjs-rails mysql2 prototype-rails - rails (= 3.2.21) + rails (~> 3.2) rails_bootstrap_sortable rdiscount rouge @@ -203,3 +203,6 @@ uglifier verification! will_paginate (~> 3.0.7) + +BUNDLED WITH + 1.12.5