Update Potlatch 2 to 2.3-515-gd4558d1 build

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 2407a9fdd134254d1deb8f5f5f09d6c298c9bca5..4644d07ea4f5648d9a5b2b50100d00ca7d3a8fb0 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -20,18 +20,16 @@ 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'
 
-# Browser detection support
-gem 'browser'
-
 # Markdown formatting support
 gem 'redcarpet'
 
@@ -66,4 +64,5 @@ group :assets do
   gem 'coffee-rails', '~> 3.2.1'
   gem 'uglifier', '>= 1.0.3'
   gem 'therubyracer'
+  gem 'ejs'
 end