aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.github
diff options
context:
space:
mode:
authorMichel Etienne2012-07-03 16:55:34 +0200
committerMichel Etienne2012-07-03 16:55:34 +0200
commit2ebd042fc74919dc21e40c9faffb6e785a255b56 (patch)
tree39a1885cd20b8d5682d67f94841cfff510249ae4 /Gemfile.github
parentdcdc2b459213abe20ac6d154610eba0e72301200 (diff)
downloadchouette-core-2ebd042fc74919dc21e40c9faffb6e785a255b56.tar.bz2
add route link on stop_area view
Diffstat (limited to 'Gemfile.github')
-rw-r--r--Gemfile.github20
1 files changed, 11 insertions, 9 deletions
diff --git a/Gemfile.github b/Gemfile.github
index 5f9acce31..b2c77f9aa 100644
--- a/Gemfile.github
+++ b/Gemfile.github
@@ -1,17 +1,17 @@
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 "jruby-rack-worker"
gem 'warbler'
+ gem "jruby-rack-worker"
end
platforms :ruby do
@@ -25,21 +25,22 @@ 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 'formtastic'
gem 'inherited_resources'
gem 'will_paginate', '~> 3.0'
-# gem 'will-paginate-i18n','~> 0.1.5'
gem 'ransack'
gem 'squeel'
gem 'RedCloth'
+gem 'jquery-rails'
+gem "modernizr-rails", "~> 2.0.6"
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 'ninoxe', :git => 'git://github.com/ninoxe.git'
gem 'acts_as_list', '0.1.6'
-gem 'composite_primary_keys', '4.1.2'
+gem 'composite_primary_keys', '4.1.2'
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.
@@ -48,7 +49,8 @@ group :assets do
gem 'coffee-rails', '~> 3.1.1'
gem 'coffee-script-source'
gem 'uglifier', '>= 1.0.3'
- gem 'therubyrhino'
+ gem 'therubyrhino', :platform => :jruby
+ gem 'therubyracer', :platform => :ruby
end
group :development do
@@ -69,7 +71,7 @@ end
group :test do
gem 'capybara'
gem 'launchy'
- gem 'database_cleaner'
+ gem 'database_cleaner', :git => 'git://github.com/dnagir/database_cleaner.git', :branch => 'postgre_jruby_issue'
gem 'factory_girl_rails', '1.7'
end