Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2

2 files changed, 79 insertions, 1 deletions

diff --git a/Gemfile.github b/Gemfile.github
new file mode 100644
index 000000000..5f9acce31
--- /dev/null
+++ b/Gemfile.github
@@ -0,0 +1,79 @@
+source 'http://rubygems.org'
+
+gem 'rails', '3.1.3'
+gem 'jquery-rails'
+gem 'devise'
+
+gem "ffi-proj4", :git => 'git://github.com/dryade/ffi-proj4.git'
+gem "jruby-rack-worker"
+
+platforms :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter', :git => 'git://github.com/dryade/activerecord-jdbc-adapter.git'
+  gem 'activerecord-jdbcsqlite3-adapter'
+  gem 'jruby-openssl'
+  gem 'warbler'   
+end
+
+platforms :ruby do    
+  gem 'pg', '~> 0.11.0' 
+  gem 'sqlite3'
+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 'json'
+gem 'cocoon'
+gem 'formtastic', '2.0.2'
+gem 'inherited_resources'
+gem 'will_paginate', '~> 3.0'
+# gem 'will-paginate-i18n','~> 0.1.5'
+gem 'ransack'
+gem 'squeel'
+gem 'RedCloth'
+
+gem "acts_as_tree", :git => "git://github.com/dryade/acts_as_tree.git"
+gem 'apartment', :git => 'git://github.com/dryade/apartment.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 'delayed_job_active_record'
+
+# 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 'coffee-script-source'
+  gem 'uglifier', '>= 1.0.3'
+  gem 'therubyrhino'
+end
+
+group :development do 
+  gem 'capistrano'
+  gem 'capistrano-ext'   
+  gem 'guard'
+  gem 'guard-rspec'
+end
+
+group :test, :development do
+  gem "rspec"
+  gem "rspec-rails"
+  gem "remarkable", "~> 4.0.0.alpha4"           
+  gem "remarkable_activerecord", "~> 4.0.0.alpha4" 
+  gem "shoulda", :git => 'git://github.com/thoughtbot/shoulda.git'
+end
+
+group :test do
+  gem 'capybara'     
+  gem 'launchy'
+  gem 'database_cleaner'
+  gem 'factory_girl_rails', '1.7'
+end
+
+group :production do
+   gem "SyslogLogger"
+end
+
diff --git a/Gemfile.lock b/Gemfile.lock
index ea51bb146..9da5dfef8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -196,7 +196,6 @@ GEM
     jruby-rack (1.1.6)
     jruby-rack-worker (0.3-java)
       jruby-rack (>= 1.0.1)
-    json (1.7.3)
     json (1.7.3-java)
     json_pure (1.7.3)
     launchy (2.1.0)