synchro Gemfile.github

1 files changed, 6 insertions, 6 deletions

diff --git a/Gemfile.github b/Gemfile.github
index b2c77f9aa..8501a21c3 100644
--- a/Gemfile.github
+++ b/Gemfile.github
@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.1.3'
+gem 'rails', '3.2.6'
 gem 'devise'
 
 gem "ffi-proj4", :git => 'git://github.com/dryade/ffi-proj4.git'
@@ -22,7 +22,7 @@ end
 gem "map_layers", "~> 0.0.4"
 gem "georuby-ext", :git => 'git://github.com/dryade/georuby-ext.git'
 
-gem 'user_interface', :git => 'git://github.com/dryade/user-interface.git'
+gem 'user_interface', :git => 'git://github.com/dryade/user-interface'
 gem 'json'
 gem 'cocoon'
 gem 'formtastic'
@@ -35,18 +35,18 @@ gem 'jquery-rails'
 gem "modernizr-rails", "~> 2.0.6"
 
 gem "acts_as_tree", :git => "git://github.com/dryade/acts_as_tree.git"
-gem 'ninoxe', :git => 'git://github.com/ninoxe.git' 
+gem 'ninoxe', :git => 'git://github.com/dryade/ninoxe.git'
 gem 'acts_as_list', '0.1.6'
 
-gem 'composite_primary_keys', '4.1.2'
+#gem 'composite_primary_keys', '~> 5.0.8'
 gem 'delayed_job_active_record'
 gem 'apartment',:git => 'git://github.com/dryade/apartment.git'
 
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  gem 'sass-rails',   '= 3.1.4'
-  gem 'coffee-rails', '~> 3.1.1'
+  gem 'sass-rails',   '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
   gem 'coffee-script-source'
   gem 'uglifier', '>= 1.0.3'
   gem 'therubyrhino', :platform => :jruby