X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2e349ab51a61bc9b4685bd8ae16735ad2e73ea26..d5841403c44a6b74ef2200c68b4fd08cd65dbbb7:/Gemfile diff --git a/Gemfile b/Gemfile index ad2f04c29..4644d07ea 100644 --- a/Gemfile +++ b/Gemfile @@ -20,11 +20,12 @@ gem 'rinku', '>= 1.2.2', :require => 'rails_rinku' 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.8' +gem 'composite_primary_keys', '>= 5.0.9' gem 'http_accept_language', '>= 1.0.2' gem 'paperclip', '~> 2.0' gem 'deadlock_retry', '>= 1.2.0' gem 'i18n-js', '>= 3.0.0.rc2' +gem 'rack-cors' # We need ruby-openid 2.2.0 or later for ruby 1.9 support gem 'ruby-openid', '>= 2.2.0' @@ -63,4 +64,5 @@ group :assets do gem 'coffee-rails', '~> 3.2.1' gem 'uglifier', '>= 1.0.3' gem 'therubyracer' + gem 'ejs' end