Update Potlatch 2 to 2.3-415-g05324af build

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index e2d0b0c759abe0823d8409b1bd038982460a6900..7109b12368f97324f1e82df298c98da79ce0545e 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@
 source 'http://rubygems.org'
 
 # Require rails
-gem 'rails', '3.2.5'
+gem 'rails', '3.2.6'
 
 # Require things which have moved to gems in ruby 1.9
 gem 'bigdecimal', :platforms => :ruby_19
@@ -20,11 +20,14 @@ gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
 gem 'openstreetmap-oauth-plugin', '>= 0.4.0.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.0'
+gem 'composite_primary_keys', '>= 5.0.8'
 gem 'http_accept_language', '>= 1.0.2'
 gem 'paperclip', '~> 2.0'
 gem 'deadlock_retry', '>= 1.2.0'
 
+# Browser detection support
+gem 'browser'
+
 # Markdown formatting support
 gem 'redcarpet'