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

1 files changed, 19 insertions, 49 deletions

diff --git a/Gemfile b/Gemfile
index 9ca6122ed..1ed841ed4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,31 +1,35 @@
 source 'http://rubygems.org'
 
 gem 'rails', '3.1.3'
-
-# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
-
-gem 'user_interface', :git => 'git://sim.dryade.priv/user_interface'
-
-gem 'apartment', :git => 'git://github.com/dryade/apartment.git'
-
+gem 'jquery-rails'
 gem 'devise'
 
-gem "map_layers", "~> 0.0.4"
-
 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'
+  gem 'capybara-webkit'   
 end
 
+gem "map_layers", "~> 0.0.4"
+
+gem 'user_interface', :git => 'git://sim.dryade.priv/user_interface'
 gem 'json'
-gem 'warbler'
+gem 'formtastic'
+gem 'inherited_resources'
+gem 'will_paginate', '~> 3.0'
+gem 'ransack'
+gem 'squeel'
+
+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://chouette.dryade.priv/ninoxe'#, :path => '~/projects/ninoxe'
 
 # Gems used only for assets and not required
 # in production environments by default.
@@ -37,39 +41,14 @@ group :assets do
   gem 'therubyrhino'
 end
 
-gem 'jquery-rails'
-
-# To use ActiveModel has_secure_password
-# gem 'bcrypt-ruby', '~> 3.0.0'
-
-# Use unicorn as the web server
-# gem 'unicorn'
-
-# Deploy with Capistrano
-# gem 'capistrano'
-
-# To use debugger
-# gem 'ruby-debug'
-
-gem 'formtastic'
-gem 'inherited_resources'
-gem 'will_paginate', '~> 3.0'
-gem 'ransack'
-gem 'squeel'
-gem 'RedCloth'
-
-gem 'ninoxe', :git => 'git://chouette.dryade.priv/ninoxe'#, :path => '~/projects/ninoxe'
-
 group :development do 
-  gem 'autotest-rails'
-  gem 'autotest-notification' 
   gem 'capistrano'
   gem 'capistrano-ext'   
   gem 'guard'
   gem 'guard-rspec'
 end
 
-group :test, :development, :cucumber do
+group :test, :development do
   gem "rspec"
   gem "rspec-rails"
   gem "remarkable", "~> 4.0.0.alpha4"           
@@ -77,20 +56,11 @@ group :test, :development, :cucumber do
   gem "shoulda", :git => 'git://github.com/thoughtbot/shoulda.git'
 end
 
-group :cucumber do
-  gem 'capybara'
-  gem 'cucumber'
-  gem 'cucumber-rails'
-  gem 'launchy'
-  gem 'pickle', :git => 'git://github.com/mflorisson/pickle.git'
-end
-
-group :test, :cucumber do
-  gem 'capybara'
+group :test do
+  gem 'capybara'     
   gem 'launchy'
   gem 'database_cleaner'
-  gem 'factory_girl_rails'
-  gem 'factory_girl'
+  gem 'factory_girl_rails', '1.7'
 end
 
 group :production do