diff options
| -rw-r--r-- | Gemfile.lock | 113 |
1 files changed, 56 insertions, 57 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 696166f..f9a6596 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,95 +28,95 @@ GEM activesupport (3.2.2) i18n (~> 0.6) multi_json (~> 1.0) - acts_as_list (0.1.9) - addressable (2.3.2) + acts_as_list (0.1.5) + addressable (2.2.7) arel (3.0.2) bcrypt-ruby (3.0.1) - breadcrumbs_on_rails (2.3.0) - builder (3.0.4) - cancan (1.6.8) - carrierwave (0.7.1) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) - chunky_png (1.2.6) + breadcrumbs_on_rails (2.2.0) + builder (3.0.0) + cancan (1.6.7) + carrierwave (0.5.8) + activesupport (~> 3.0) + chunky_png (1.2.5) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.4.0) - compass (0.12.2) + coffee-script-source (1.2.0) + compass (0.12.rc.1) chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1) - compass-rails (1.0.3) - compass (>= 0.12.2, < 0.14) + compass-rails (1.0.0.rc.3) + compass (~> 0.12.rc.0) cookiejar (0.3.0) - delayed_job (3.0.4) + delayed_job (3.0.1) activesupport (~> 3.0) - delayed_job_active_record (0.3.3) - activerecord (>= 2.1.0, < 4) - delayed_job (~> 3.0) - em-http-request (1.0.3) + delayed_job_active_record (0.3.2) + activerecord (> 2.1.0) + delayed_job (~> 3.0.0) + em-http-request (1.0.1) addressable (>= 2.2.3) cookiejar em-socksify eventmachine (>= 1.0.0.beta.4) http_parser.rb (>= 0.5.3) - em-socksify (0.2.1) - eventmachine (>= 1.0.0.beta.4) + em-socksify (0.1.0) + eventmachine erubis (2.7.0) - eventmachine (1.0.0) - execjs (1.4.0) + eventmachine (1.0.0.beta.4) + execjs (1.3.0) multi_json (~> 1.0) - factory_girl (4.1.0) - activesupport (>= 3.0.0) - factory_girl_rails (4.1.0) - factory_girl (~> 4.1.0) + factory_girl (2.6.1) + activesupport (>= 2.3.9) + factory_girl_rails (1.7.0) + factory_girl (~> 2.6.0) railties (>= 3.0.0) - faye (0.8.6) + faye (0.8.0) cookiejar (>= 0.3.0) em-http-request (>= 0.3.0) eventmachine (>= 0.12.0) faye-websocket (>= 0.4.0) rack (>= 1.0.0) yajl-ruby (>= 1.0.0) - faye-websocket (0.4.6) + faye-websocket (0.4.1) eventmachine (>= 0.12.0) - fssm (0.2.9) + fssm (0.2.8.1) haml (3.1.7) hike (1.2.1) - hirb (0.7.0) + hirb (0.6.1) http_accept_language (1.0.2) http_parser.rb (0.5.3) - i18n (0.6.1) - journey (1.0.4) - jquery-rails (2.1.4) - railties (>= 3.0, < 5.0) - thor (>= 0.14, < 2.0) - json (1.7.5) + i18n (0.6.0) + journey (1.0.3) + jquery-rails (2.0.1) + railties (>= 3.2.0, < 5.0) + thor (~> 0.14) + json (1.6.5) + libv8 (3.3.10.4) macaddr (1.6.1) systemu (~> 2.5.0) - mail (2.4.4) + mail (2.4.3) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.19) + mime-types (1.17.2) mini_magick (3.4) subexec (~> 0.2.1) - multi_json (1.5.0) + multi_json (1.1.0) mysql2 (0.3.11) - nokogiri (1.5.6) + nokogiri (1.5.5) polyglot (0.3.3) - private_pub (1.0.3) + private_pub (1.0.1) faye rack (1.4.1) rack-cache (1.2) rack (>= 0.4) rack-ssl (1.3.2) rack - rack-test (0.6.2) + rack-test (0.6.1) rack (>= 1.0) rails (3.2.2) actionmailer (= 3.2.2) @@ -137,39 +137,38 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (~> 0.14.6) - rake (10.0.3) + rake (0.9.2.2) rdoc (3.12) json (~> 1.4) - ref (1.0.2) ruby-graphviz (0.9.21) - sass (3.2.4) - sass-rails (3.2.5) + sass (3.1.15) + sass-rails (3.2.4) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) simple_form (2.0.1) actionpack (~> 3.0) activemodel (~> 3.0) - sprockets (2.1.3) + sprockets (2.1.2) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.6) + sqlite3 (1.3.5) state_machine (1.1.2) - subexec (0.2.2) - systemu (2.5.2) - therubyracer (0.11.0) - ref + subexec (0.2.1) + systemu (2.5.1) + therubyracer (0.9.10) + libv8 (~> 3.3.10) thor (0.14.6) tilt (1.3.3) - treetop (1.4.12) + treetop (1.4.10) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.35) - uglifier (1.3.0) + tzinfo (0.3.32) + uglifier (1.2.3) execjs (>= 0.3.0) - multi_json (~> 1.0, >= 1.0.2) - uuid (2.3.6) + multi_json (>= 1.0.2) + uuid (2.3.5) macaddr (~> 1.0) will_paginate (3.0.3) yajl-ruby (1.1.0) |