use ninoxe from github

2 files changed, 17 insertions, 13 deletions

diff --git a/Gemfile b/Gemfile
index b225f8084..3769df2c7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -115,9 +115,8 @@ 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'
-#gem 'ninoxe',:path => '~/Projets/cityway/ninoxe'
-gem 'ninoxe', '1.2.0'
+gem 'ninoxe', :git => 'https://github.com/afimb/ninoxe.git'
+#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 711760304..9c10944ad 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,17 @@
+GIT
+  remote: https://github.com/afimb/ninoxe.git
+  revision: 0c548adb266659e7aacd9a7b055e6eb9e21baf66
+  specs:
+    ninoxe (1.2.0)
+      activerecord (~> 4.1.1)
+      acts-as-taggable-on (>= 3)
+      acts_as_list (>= 0.1.6)
+      acts_as_tree (>= 1.1.0)
+      deep_cloneable (~> 2.0.0)
+      enumerize (~> 0.10.0)
+      foreigner (= 1.6.0)
+      georuby-ext (= 0.0.5)
+
 GEM
   remote: http://rubygems.org/
   remote: https://rails-assets.org/
@@ -245,15 +259,6 @@ GEM
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
     newrelic_rpm (3.9.6.257)
-    ninoxe (1.2.0)
-      activerecord (~> 4.1.1)
-      acts-as-taggable-on (>= 3)
-      acts_as_list (>= 0.1.6)
-      acts_as_tree (>= 1.1.0)
-      deep_cloneable (~> 2.0.0)
-      enumerize (~> 0.10.0)
-      foreigner (= 1.6.0)
-      georuby-ext (= 0.0.5)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     nokogiri (1.6.6.2-java)
@@ -521,7 +526,7 @@ DEPENDENCIES
   mimemagic
   modernizr-rails (~> 2.0.6)
   newrelic_rpm
-  ninoxe (= 1.2.0)
+  ninoxe!
   pg
   poltergeist
   pry-rails