From 2ebd042fc74919dc21e40c9faffb6e785a255b56 Mon Sep 17 00:00:00 2001 From: Michel Etienne Date: Tue, 3 Jul 2012 16:55:34 +0200 Subject: add route link on stop_area view --- Gemfile.github | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'Gemfile.github') 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 -- cgit v1.2.3 From 58a44e57f989f6467e43f28f472ca5511550aa37 Mon Sep 17 00:00:00 2001 From: Michel Etienne Date: Fri, 6 Jul 2012 10:03:55 +0200 Subject: synchro Gemfile.github --- Gemfile.github | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Gemfile.github') 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 -- cgit v1.2.3 From 3a291e506dd0d5c9fedc83b97948dbaf1c42d8fe Mon Sep 17 00:00:00 2001 From: Michel Etienne Date: Fri, 6 Jul 2012 15:00:11 +0200 Subject: github integration --- Gemfile.github | 81 ---------------------------------------------------------- 1 file changed, 81 deletions(-) delete mode 100644 Gemfile.github (limited to 'Gemfile.github') diff --git a/Gemfile.github b/Gemfile.github deleted file mode 100644 index 8501a21c3..000000000 --- a/Gemfile.github +++ /dev/null @@ -1,81 +0,0 @@ -source 'http://rubygems.org' - -gem 'rails', '3.2.6' -gem 'devise' - -gem "ffi-proj4", :git => 'git://github.com/dryade/ffi-proj4.git' - -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 - 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' -gem 'json' -gem 'cocoon' -gem 'formtastic' -gem 'inherited_resources' -gem 'will_paginate', '~> 3.0' -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 'ninoxe', :git => 'git://github.com/dryade/ninoxe.git' -gem 'acts_as_list', '0.1.6' - -#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.2.3' - gem 'coffee-rails', '~> 3.2.1' - gem 'coffee-script-source' - gem 'uglifier', '>= 1.0.3' - gem 'therubyrhino', :platform => :jruby - gem 'therubyracer', :platform => :ruby -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', :git => 'git://github.com/dnagir/database_cleaner.git', :branch => 'postgre_jruby_issue' - gem 'factory_girl_rails', '1.7' -end - -group :production do - gem "SyslogLogger" -end - -- cgit v1.2.3