2 files changed, 5 insertions, 7 deletions
diff --git a/Gemfile b/Gemfile
index 3c8b68735..1674d9a34 100644
--- a/Gemfile
+++ b/Gemfile
@@ -114,10 +114,10 @@ gem 'squeel'
 
 gem 'enumerize', '~> 0.10.0'
 
-gem 'ninoxe', :git => 'https://github.com/afimb/ninoxe.git', :branch => "rails4"
+#gem 'ninoxe', :git => 'https://github.com/afimb/ninoxe.git', :branch => "rails4"
 #gem 'ninoxe', :git => 'https://github.com/afimb/ninoxe.git'
 #gem 'ninoxe',:path => '~/Projets/cityway/ninoxe'
-#gem 'ninoxe', '1.1.5'
+gem 'ninoxe', '1.2.0'
 
 gem 'acts_as_list', '~> 0.6.0'
 gem "acts_as_tree", '~> 2.1.0', :require => "acts_as_tree"
diff --git a/Gemfile.lock b/Gemfile.lock
index fc6844c5d..26816f113 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,9 +1,7 @@
-GIT
-  remote: https://github.com/afimb/ninoxe.git
-  revision: 5eb3f53d63e22055b939bd96da586020bd176514
-  branch: rails4
+PATH
+  remote: ~/dev/ninoxe
   specs:
-    ninoxe (1.1.5)
+    ninoxe (1.2.0)
       activerecord (~> 4.1.1)
       acts-as-taggable-on (>= 3)
       acts_as_list (>= 0.1.6)