X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/06934ad37565a1c5d251a5474a778b29b16591d1..38a610fd316c4d5143c2af2e71f73da6f249ac45:/Gemfile diff --git a/Gemfile b/Gemfile index 74f6009b6..2511fd7ea 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'http://rubygems.org' # Require rails -gem 'rails', '3.2.1' +gem 'rails', '3.2.2' # Require the postgres database driver gem 'pg' @@ -11,7 +11,7 @@ gem 'pg' gem 'jquery-rails' # Load rails plugins -gem 'rails-i18n', ">= 0.5.1" +gem 'rails-i18n', ">= 0.5.2" gem 'dynamic_form' gem 'rinku', '>= 1.2.2', :require => 'rails_rinku' gem 'oauth-plugin', '>= 0.4.0.pre7' @@ -22,14 +22,18 @@ gem 'http_accept_language', '>= 1.0.2' gem 'paperclip', '~> 2.0' gem 'deadlock_retry', '>= 1.2.0' +# Markdown formatting support +gem 'redcarpet' + # Character conversion support for ruby 1.8 gem 'iconv', :platforms => :ruby_18 # Load libxml support for XML parsing and generation gem 'libxml-ruby', '>= 2.0.5', :require => 'libxml' -# Load HTML sanitizer +# Use for HTML sanitisation gem 'sanitize' +gem 'htmlentities' # Load SystemTimer for implementing request timeouts gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer', :platforms => :ruby_18