set ninoxe as gem 1.1.0

2 files changed, 12 insertions, 18 deletions

diff --git a/Gemfile b/Gemfile
index 0af970b6c..46fc73fd4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -74,9 +74,9 @@ gem 'google-analytics-rails'
 gem 'will_paginate', '~> 3.0'
 gem 'ransack'
 gem 'squeel'
-gem 'ninoxe', :git => 'https://github.com/afimb/ninoxe.git', :branch => :sismo
+#gem 'ninoxe', :git => 'https://github.com/afimb/ninoxe.git', :branch => :sismo
 #gem 'ninoxe',:path => '~/workspace/chouette/ninoxe'
-#gem 'ninoxe', '~> 1.0.3'
+gem 'ninoxe', '~> 1.1.0'
 
 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 47272cc14..78128d3d1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,17 +1,3 @@
-GIT
-  remote: https://github.com/afimb/ninoxe.git
-  revision: 9a9563cc869e0353d6b073ce5aacc3d07a7217c0
-  branch: sismo
-  specs:
-    ninoxe (1.1.0)
-      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)
-      foreigner (= 1.6.0)
-      georuby-ext (= 0.0.5)
-
 GEM
   remote: http://rubygems.org/
   remote: https://rails-assets.org/
@@ -212,6 +198,14 @@ GEM
     net-ssh (2.6.2)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
+    ninoxe (1.1.0)
+      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)
+      foreigner (= 1.6.0)
+      georuby-ext (= 0.0.5)
     nokogiri (1.5.10)
     nokogiri (1.5.10-java)
     open4 (1.3.0)
@@ -354,7 +348,7 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.41)
+    tzinfo (0.3.42)
     uglifier (1.2.7)
       execjs (>= 0.3.0)
       multi_json (~> 1.3)
@@ -417,7 +411,7 @@ DEPENDENCIES
   map_layers (= 0.0.4)
   modernizr-rails (~> 2.0.6)
   morrisjs-rails
-  ninoxe!
+  ninoxe (~> 1.1.0)
   pg (~> 0.11.0)
   rabl
   rails (= 3.2.18)