diff options
| -rw-r--r-- | Gemfile | 6 | ||||
| -rw-r--r-- | Gemfile.lock | 86 |
2 files changed, 64 insertions, 28 deletions
@@ -7,7 +7,7 @@ if File.exist? "/etc/debian_version" and File.open("/etc/debian_version").read.s end source :rubygems -gem 'rails', '2.3.14' +gem 'rails', '3.0.17' gem 'pg' gem 'fast_gettext', '>= 0.6.0' @@ -21,8 +21,8 @@ gem 'memcache-client', :require => 'memcache' gem 'locale', '>= 2.0.5' gem 'net-http-local' gem 'net-purge' -gem 'rack', '~> 1.1.0' -gem 'rdoc', '~> 2.4.3' +gem 'rack' +gem 'rdoc' gem 'recaptcha', '~> 0.3.1', :require => 'recaptcha/rails' # :require avoids "already initialized constant" warnings gem 'rmagick', :require => 'RMagick' diff --git a/Gemfile.lock b/Gemfile.lock index a5832d5a9..2f0e3f4d1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,21 +1,40 @@ GEM remote: http://rubygems.org/ specs: - actionmailer (2.3.14) - actionpack (= 2.3.14) - actionpack (2.3.14) - activesupport (= 2.3.14) - rack (~> 1.1.0) - activerecord (2.3.14) - activesupport (= 2.3.14) - activeresource (2.3.14) - activesupport (= 2.3.14) - activesupport (2.3.14) + abstract (1.0.0) + actionmailer (3.0.17) + actionpack (= 3.0.17) + mail (~> 2.2.19) + actionpack (3.0.17) + activemodel (= 3.0.17) + activesupport (= 3.0.17) + builder (~> 2.1.2) + erubis (~> 2.6.6) + i18n (~> 0.5.0) + rack (~> 1.2.5) + rack-mount (~> 0.6.14) + rack-test (~> 0.5.7) + tzinfo (~> 0.3.23) + activemodel (3.0.17) + activesupport (= 3.0.17) + builder (~> 2.1.2) + i18n (~> 0.5.0) + activerecord (3.0.17) + activemodel (= 3.0.17) + activesupport (= 3.0.17) + arel (~> 2.0.10) + tzinfo (~> 0.3.23) + activeresource (3.0.17) + activemodel (= 3.0.17) + activesupport (= 3.0.17) + activesupport (3.0.17) annotate (2.5.0) rake archive-tar-minitar (0.5.2) + arel (2.0.10) bootstrap-sass (2.2.1.1) sass (~> 3.2) + builder (2.1.2) capistrano (2.13.5) highline net-scp (>= 1.0.0) @@ -29,6 +48,8 @@ GEM fssm (>= 0.2.7) sass (~> 3.1) daemons (1.1.9) + erubis (2.6.6) + abstract (>= 1.0.0) eventmachine (1.0.0) fakeweb (1.3.0) fast_gettext (0.6.11) @@ -42,7 +63,7 @@ GEM highline (1.6.15) hoe (3.3.1) rake (>= 0.8, < 11.0) - i18n (0.6.1) + i18n (0.5.0) json (1.5.4) linecache (0.46) rbx-require-relative (> 0.0.4) @@ -50,7 +71,8 @@ GEM ruby_core_source (>= 0.1.4) locale (2.0.8) mahoro (0.3) - mail (2.5.3) + mail (2.2.19) + activesupport (>= 2.3.6) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) @@ -78,17 +100,29 @@ GEM newrelic_rpm (3.5.3.25) pg (0.14.1) polyglot (0.3.3) - rack (1.1.3) - rails (2.3.14) - actionmailer (= 2.3.14) - actionpack (= 2.3.14) - activerecord (= 2.3.14) - activeresource (= 2.3.14) - activesupport (= 2.3.14) - rake (>= 0.8.3) + rack (1.2.5) + rack-mount (0.6.14) + rack (>= 1.0.0) + rack-test (0.5.7) + rack (>= 1.0) + rails (3.0.17) + actionmailer (= 3.0.17) + actionpack (= 3.0.17) + activerecord (= 3.0.17) + activeresource (= 3.0.17) + activesupport (= 3.0.17) + bundler (~> 1.0) + railties (= 3.0.17) + railties (3.0.17) + actionpack (= 3.0.17) + activesupport (= 3.0.17) + rake (>= 0.8.7) + rdoc (~> 3.4) + thor (~> 0.14.4) rake (0.9.2.2) rbx-require-relative (0.0.9) - rdoc (2.4.3) + rdoc (3.12) + json (~> 1.4) recaptcha (0.3.4) rmagick (2.13.1) routing-filter (0.2.4) @@ -113,7 +147,7 @@ GEM ruby-msg (1.5.1) ruby-ole (>= 1.2.8) vpim (>= 0.360) - ruby-ole (1.2.11.5) + ruby-ole (1.2.11.6) ruby_core_source (0.1.5) archive-tar-minitar (>= 0.5.2) sass (3.2.3) @@ -133,10 +167,12 @@ GEM daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) + thor (0.14.6) tilt (1.3.3) treetop (1.4.12) polyglot polyglot (>= 0.3.1) + tzinfo (0.3.35) vpim (0.695) will_paginate (2.3.16) xapian-full-alaveteli (1.2.9.5) @@ -166,10 +202,10 @@ DEPENDENCIES net-purge newrelic_rpm pg - rack (~> 1.1.0) - rails (= 2.3.14) + rack + rails (= 3.0.17) rake (= 0.9.2.2) - rdoc (~> 2.4.3) + rdoc recaptcha (~> 0.3.1) rmagick routing-filter (~> 0.2.4) |