diff options
| author | Michel Etienne | 2012-07-06 10:03:55 +0200 |
|---|---|---|
| committer | Michel Etienne | 2012-07-06 10:03:55 +0200 |
| commit | 58a44e57f989f6467e43f28f472ca5511550aa37 (patch) | |
| tree | 5e9bb74dbbc8b14f2f4f7a4fee62fbe3784dbfc6 | |
| parent | 57f96c8fbeda9cc50b8167cc23ea703900b75de5 (diff) | |
| download | chouette-core-58a44e57f989f6467e43f28f472ca5511550aa37.tar.bz2 | |
synchro Gemfile.github
| -rw-r--r-- | Gemfile.github | 12 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 10 insertions, 10 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 diff --git a/Gemfile.lock b/Gemfile.lock index 60277beeb..f7298e6f3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,14 +1,14 @@ GIT remote: git://chouette.dryade.priv/ninoxe - revision: 49ca25a1cb40534346e5d439144fdaae4a13dc21 + revision: 34f3b94569b35d8ce51e2b036c12e067e2222eec specs: ninoxe (0.0.8) GeoRuby - activerecord (> 3.1.3) + activerecord (>= 3.1.3) acts_as_list (= 0.1.6) - composite_primary_keys (> 4.1.2) + composite_primary_keys (>= 4.1.2) geokit - rails (> 3.1.3) + rails (>= 3.1.3) GIT remote: git://github.com/dnagir/database_cleaner.git |