diff options
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 25 |
3 files changed, 13 insertions, 18 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f906e5a6..b0fee73b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Version 2.5.2 (09/01/15) +# Version 2.5.2 (20/01/15) * Nouvelles foctionnalités * Amélioration de l'export Hub * Ajout de points de contrôle pour la validation @@ -76,9 +76,9 @@ gem 'google-analytics-rails' gem 'will_paginate', '~> 3.0' gem 'ransack' gem 'squeel' -gem 'ninoxe', :git => 'https://github.com/afimb/ninoxe.git' +#gem 'ninoxe', :git => 'https://github.com/afimb/ninoxe.git' #gem 'ninoxe',:path => '~/workspace/chouette/ninoxe' -#gem 'ninoxe', '~> 1.1.3' +gem 'ninoxe', '1.1.4' gem 'acts_as_list', '0.1.6' gem "acts_as_tree-1.8", '1.1.0', :require => "acts_as_tree" diff --git a/Gemfile.lock b/Gemfile.lock index 6925e223d..048a94eaf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,3 @@ -GIT - remote: https://github.com/afimb/ninoxe.git - revision: 95471a42daa8a0183f94b1f3beac9242033ed236 - specs: - ninoxe (1.1.3) - activerecord (~> 3.2.13) - acts-as-taggable-on (>= 3) - acts_as_list (>= 0.1.6) - acts_as_tree (>= 1.1.0) - deep_cloneable (~> 2.0.0) - enumerize (~> 0.8.0) - foreigner (= 1.6.0) - georuby-ext (= 0.0.5) - GEM remote: http://rubygems.org/ remote: https://rails-assets.org/ @@ -222,6 +208,15 @@ GEM net-ssh-gateway (1.1.0) net-ssh (>= 1.99.1) netrc (0.7.9) + ninoxe (1.1.4) + activerecord (~> 3.2.13) + acts-as-taggable-on (>= 3) + acts_as_list (>= 0.1.6) + acts_as_tree (>= 1.1.0) + deep_cloneable (~> 2.0.0) + enumerize (~> 0.8.0) + foreigner (= 1.6.0) + georuby-ext (= 0.0.5) nokogiri (1.5.10) nokogiri (1.5.10-java) open4 (1.3.0) @@ -434,7 +429,7 @@ DEPENDENCIES meta_request modernizr-rails (~> 2.0.6) morrisjs-rails - ninoxe! + ninoxe (= 1.1.4) pg (~> 0.11.0) rabl rails (= 3.2.18) |