X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/fe3eaafd3e4e3867147e73c75389dc4e82e64718..0d3a9ed9cb47ce3b89ea9eaffbb589f9a9ff6d22:/Gemfile diff --git a/Gemfile b/Gemfile index 10f38eb38..25b10fe7b 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'http://rubygems.org' # Require rails -gem 'rails', '3.2.5' +gem 'rails', '3.2.8' # Require things which have moved to gems in ruby 1.9 gem 'bigdecimal', :platforms => :ruby_19 @@ -17,13 +17,20 @@ gem 'jquery-rails' gem 'rails-i18n', ">= 0.6.3" gem 'dynamic_form' gem 'rinku', '>= 1.2.2', :require => 'rails_rinku' -gem 'openstreetmap-oauth-plugin', '>= 0.4.0.1', :require => 'oauth-plugin' +gem 'oauth-plugin', '>= 0.4.1', :require => 'oauth-plugin' gem 'open_id_authentication', '>= 1.1.0' gem 'validates_email_format_of', '>= 1.5.1' -gem 'composite_primary_keys', '= 5.0.4' +gem 'composite_primary_keys', '>= 5.0.8' gem 'http_accept_language', '>= 1.0.2' gem 'paperclip', '~> 2.0' gem 'deadlock_retry', '>= 1.2.0' +gem 'jsonify-rails' + +# We need ruby-openid 2.2.0 or later for ruby 1.9 support +gem 'ruby-openid', '>= 2.2.0' + +# Browser detection support +gem 'browser' # Markdown formatting support gem 'redcarpet'