diff options
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 220 |
1 files changed, 122 insertions, 98 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f9a6596..79c6339 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,176 +1,194 @@ GEM remote: http://rubygems.org/ specs: - actionmailer (3.2.2) - actionpack (= 3.2.2) - mail (~> 2.4.0) - actionpack (3.2.2) - activemodel (= 3.2.2) - activesupport (= 3.2.2) + actionmailer (3.2.11) + actionpack (= 3.2.11) + mail (~> 2.4.4) + actionpack (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) builder (~> 3.0.0) erubis (~> 2.7.0) - journey (~> 1.0.1) + journey (~> 1.0.4) rack (~> 1.4.0) - rack-cache (~> 1.1) + rack-cache (~> 1.2) rack-test (~> 0.6.1) - sprockets (~> 2.1.2) - activemodel (3.2.2) - activesupport (= 3.2.2) + sprockets (~> 2.2.1) + activemodel (3.2.11) + activesupport (= 3.2.11) builder (~> 3.0.0) - activerecord (3.2.2) - activemodel (= 3.2.2) - activesupport (= 3.2.2) + activerecord (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.2) - activemodel (= 3.2.2) - activesupport (= 3.2.2) - activesupport (3.2.2) + activeresource (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) + activesupport (3.2.11) i18n (~> 0.6) multi_json (~> 1.0) - acts_as_list (0.1.5) - addressable (2.2.7) + acts_as_list (0.1.9) + addressable (2.3.2) arel (3.0.2) bcrypt-ruby (3.0.1) - breadcrumbs_on_rails (2.2.0) - builder (3.0.0) + breadcrumbs_on_rails (2.3.0) + builder (3.0.4) + cache_digests (0.2.0) + actionpack (>= 3.2) cancan (1.6.7) - carrierwave (0.5.8) - activesupport (~> 3.0) - chunky_png (1.2.5) + carrierwave (0.8.0) + activemodel (>= 3.2.0) + activesupport (>= 3.2.0) + chunky_png (1.2.7) 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.2.0) - compass (0.12.rc.1) + coffee-script-source (1.4.0) + compass (0.12.2) chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1) - compass-rails (1.0.0.rc.3) - compass (~> 0.12.rc.0) + compass-rails (1.0.3) + compass (>= 0.12.2, < 0.14) cookiejar (0.3.0) - delayed_job (3.0.1) + daemons (1.1.9) + dalli (2.6.0) + delayed_job (3.0.4) activesupport (~> 3.0) - delayed_job_active_record (0.3.2) - activerecord (> 2.1.0) - delayed_job (~> 3.0.0) - em-http-request (1.0.1) + delayed_job_active_record (0.3.3) + activerecord (>= 2.1.0, < 4) + delayed_job (~> 3.0) + em-http-request (1.0.3) addressable (>= 2.2.3) cookiejar em-socksify eventmachine (>= 1.0.0.beta.4) http_parser.rb (>= 0.5.3) - em-socksify (0.1.0) - eventmachine + em-socksify (0.2.1) + eventmachine (>= 1.0.0.beta.4) erubis (2.7.0) - eventmachine (1.0.0.beta.4) - execjs (1.3.0) + eventmachine (1.0.0) + execjs (1.4.0) multi_json (~> 1.0) - factory_girl (2.6.1) - activesupport (>= 2.3.9) - factory_girl_rails (1.7.0) - factory_girl (~> 2.6.0) + factory_girl (4.1.0) + activesupport (>= 3.0.0) + factory_girl_rails (4.1.0) + factory_girl (~> 4.1.0) railties (>= 3.0.0) - faye (0.8.0) + faye (0.8.8) 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.1) + faye-websocket (0.4.6) eventmachine (>= 0.12.0) - fssm (0.2.8.1) + fssm (0.2.9) haml (3.1.7) hike (1.2.1) - hirb (0.6.1) + hirb (0.7.0) http_accept_language (1.0.2) http_parser.rb (0.5.3) - 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) + i18n (0.6.1) + inifile (2.0.2) + journey (1.0.4) + jquery-rails (2.1.4) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + json (1.7.6) + kgio (2.7.4) macaddr (1.6.1) systemu (~> 2.5.0) - mail (2.4.3) + mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.17.2) + mime-types (1.19) mini_magick (3.4) subexec (~> 0.2.1) - multi_json (1.1.0) + multi_json (1.5.0) mysql2 (0.3.11) - nokogiri (1.5.5) + nokogiri (1.5.6) polyglot (0.3.3) - private_pub (1.0.1) + private_pub (1.0.3) faye - rack (1.4.1) + quiet_assets (1.0.1) + railties (~> 3.1) + rack (1.4.4) rack-cache (1.2) rack (>= 0.4) rack-ssl (1.3.2) rack - rack-test (0.6.1) + rack-test (0.6.2) rack (>= 1.0) - rails (3.2.2) - actionmailer (= 3.2.2) - actionpack (= 3.2.2) - activerecord (= 3.2.2) - activeresource (= 3.2.2) - activesupport (= 3.2.2) + rails (3.2.11) + actionmailer (= 3.2.11) + actionpack (= 3.2.11) + activerecord (= 3.2.11) + activeresource (= 3.2.11) + activesupport (= 3.2.11) bundler (~> 1.0) - railties (= 3.2.2) - rails-erd (0.4.5) - activerecord (~> 3.0) - activesupport (~> 3.0) - ruby-graphviz (~> 0.9.18) - railties (3.2.2) - actionpack (= 3.2.2) - activesupport (= 3.2.2) + railties (= 3.2.11) + railties (3.2.11) + actionpack (= 3.2.11) + activesupport (= 3.2.11) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) - thor (~> 0.14.6) - rake (0.9.2.2) + thor (>= 0.14.6, < 2.0) + raindrops (0.10.0) + rake (10.0.3) rdoc (3.12) json (~> 1.4) - ruby-graphviz (0.9.21) - sass (3.1.15) - sass-rails (3.2.4) + sass (3.2.5) + sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) + sextant (0.2.3) + activesupport (>= 3.2) + rails (>= 3.2) simple_form (2.0.1) actionpack (~> 3.0) activemodel (~> 3.0) - sprockets (2.1.2) + sprockets (2.2.2) hike (~> 1.2) + multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.5) + sqlite3 (1.3.7) state_machine (1.1.2) - subexec (0.2.1) - systemu (2.5.1) - therubyracer (0.9.10) - libv8 (~> 3.3.10) - thor (0.14.6) + strong_parameters (0.1.6) + actionpack (~> 3.0) + activemodel (~> 3.0) + railties (~> 3.0) + subexec (0.2.2) + systemu (2.5.2) + thin (1.5.0) + daemons (>= 1.0.9) + eventmachine (>= 0.12.6) + rack (>= 1.0.0) + thor (0.16.0) tilt (1.3.3) - treetop (1.4.10) + treetop (1.4.12) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.32) - uglifier (1.2.3) + tzinfo (0.3.35) + uglifier (1.3.0) execjs (>= 0.3.0) - multi_json (>= 1.0.2) - uuid (2.3.5) + multi_json (~> 1.0, >= 1.0.2) + unicorn (4.5.0) + kgio (~> 2.6) + rack + raindrops (~> 0.7) + uuid (2.3.6) macaddr (~> 1.0) - will_paginate (3.0.3) + will_paginate (3.0.4) yajl-ruby (1.1.0) PLATFORMS @@ -180,10 +198,12 @@ DEPENDENCIES acts_as_list bcrypt-ruby breadcrumbs_on_rails - cancan + cache_digests + cancan (= 1.6.7) carrierwave coffee-rails (~> 3.2.1) compass-rails + dalli delayed_job delayed_job_active_record factory_girl @@ -191,19 +211,23 @@ DEPENDENCIES haml hirb http_accept_language + inifile jquery-rails json mini_magick mysql2 nokogiri private_pub - rails (= 3.2.2) - rails-erd (~> 0.4.5) - sass-rails (~> 3.2.3) + quiet_assets + rails (= 3.2.11) + sass-rails + sextant simple_form (= 2.0.1) sqlite3 state_machine - therubyracer - uglifier (>= 1.0.3) + strong_parameters + thin + uglifier (>= 1.3.0) + unicorn uuid will_paginate |