diff options
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 118 |
2 files changed, 66 insertions, 56 deletions
@@ -7,7 +7,7 @@ if File.exist? "/etc/debian_version" and File.open("/etc/debian_version").read.s end source :rubygems -gem 'rails', '3.0.17' +gem 'rails', '3.1.11' gem 'pg' gem 'fast_gettext', '>= 0.6.0' @@ -29,7 +29,7 @@ gem 'routing-filter', '~> 0.2.4' gem 'rake', '0.9.2.2' gem 'ruby-msg', '~> 1.5.0' gem 'vpim' -gem 'will_paginate', '~> 2.3.11' +gem 'will_paginate' # when 1.2.9 is released by the maintainer, we can stop using this fork: gem 'xapian-full-alaveteli', '~> 1.2.9.5' gem 'xml-simple' diff --git a/Gemfile.lock b/Gemfile.lock index ae8c9a2f8..7c898b422 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -18,39 +18,40 @@ GIT GEM remote: http://rubygems.org/ specs: - 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) + actionmailer (3.1.11) + actionpack (= 3.1.11) + mail (~> 2.3.3) + actionpack (3.1.11) + activemodel (= 3.1.11) + activesupport (= 3.1.11) + builder (~> 3.0.0) + erubis (~> 2.7.0) + i18n (~> 0.6) + rack (~> 1.3.6) + rack-cache (~> 1.2) + rack-mount (~> 0.8.2) + rack-test (~> 0.6.1) + sprockets (~> 2.0.4) + activemodel (3.1.11) + activesupport (= 3.1.11) + builder (~> 3.0.0) + i18n (~> 0.6) + activerecord (3.1.11) + activemodel (= 3.1.11) + activesupport (= 3.1.11) + arel (~> 2.2.3) + tzinfo (~> 0.3.29) + activeresource (3.1.11) + activemodel (= 3.1.11) + activesupport (= 3.1.11) + activesupport (3.1.11) + multi_json (~> 1.0) annotate (2.5.0) rake - arel (2.0.10) + arel (2.2.3) bootstrap-sass (2.2.1.1) sass (~> 3.2) - builder (2.1.2) + builder (3.0.4) capistrano (2.13.5) highline net-scp (>= 1.0.0) @@ -73,8 +74,7 @@ GEM debugger-ruby_core_source (1.1.8) diff-lcs (1.1.3) dynamic_form (1.1.4) - erubis (2.6.6) - abstract (>= 1.0.0) + erubis (2.7.0) eventmachine (1.0.0) fakeweb (1.3.0) fast_gettext (0.6.11) @@ -87,17 +87,17 @@ GEM fast_gettext (>= 0.4.8) haml (3.1.7) highline (1.6.15) + hike (1.2.1) hoe (3.3.1) rake (>= 0.8, < 11.0) - i18n (0.5.0) - json (1.5.4) + i18n (0.6.2) + json (1.5.5) levenshtein (0.2.2) linecache (0.46) rbx-require-relative (> 0.0.4) locale (2.0.8) mahoro (0.3) - mail (2.2.19) - activesupport (>= 2.3.6) + mail (2.3.3) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) @@ -112,7 +112,8 @@ GEM sqlite3-ruby thin memcache-client (1.8.5) - mime-types (1.19) + mime-types (1.21) + multi_json (1.6.1) net-http-local (0.1.2) net-purge (0.1.0) net-scp (1.0.4) @@ -129,28 +130,33 @@ GEM railties (~> 3.0) pg (0.14.1) polyglot (0.3.3) - rack (1.2.8) - rack-mount (0.6.14) + rack (1.3.10) + rack-cache (1.2) + rack (>= 0.4) + rack-mount (0.8.3) rack (>= 1.0.0) - rack-test (0.5.7) + rack-ssl (1.3.3) + rack + rack-test (0.6.2) 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) + rails (3.1.11) + actionmailer (= 3.1.11) + actionpack (= 3.1.11) + activerecord (= 3.1.11) + activeresource (= 3.1.11) + activesupport (= 3.1.11) bundler (~> 1.0) - railties (= 3.0.17) - railties (3.0.17) - actionpack (= 3.0.17) - activesupport (= 3.0.17) + railties (= 3.1.11) + railties (3.1.11) + actionpack (= 3.1.11) + activesupport (= 3.1.11) + rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) - thor (~> 0.14.4) + thor (~> 0.14.6) rake (0.9.2.2) rbx-require-relative (0.0.9) - rdoc (3.12) + rdoc (3.12.2) json (~> 1.4) recaptcha (0.3.4) rmagick (2.13.1) @@ -187,6 +193,10 @@ GEM spork-rails (3.2.1) rails (>= 3.0.0, < 3.3.0) spork (>= 1.0rc0) + sprockets (2.0.4) + hike (~> 1.2) + rack (~> 1.0) + tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.6) sqlite3-ruby (1.3.3) sqlite3 (>= 1.3.3) @@ -208,7 +218,7 @@ GEM nokogiri (>= 1.2.0) rack (>= 1.0) rack-test (>= 0.5.3) - will_paginate (2.3.16) + will_paginate (3.0.4) xapian-full-alaveteli (1.2.9.5) xml-simple (1.1.2) zip (2.0.2) @@ -240,7 +250,7 @@ DEPENDENCIES newrelic_rpm pg rack - rails (= 3.0.17) + rails (= 3.1.11) rake (= 0.9.2.2) rdoc recaptcha (~> 0.3.1) @@ -254,7 +264,7 @@ DEPENDENCIES test-unit (~> 1.2.3) vpim webrat - will_paginate (~> 2.3.11) + will_paginate xapian-full-alaveteli (~> 1.2.9.5) xml-simple zip |