update Gemfile, set ninoxe to version 0.1.2

2 files changed, 7 insertions, 13 deletions

diff --git a/Gemfile b/Gemfile
index 11dc7d562..8db7eb582 100644
--- a/Gemfile
+++ b/Gemfile
@@ -45,8 +45,7 @@ gem 'inherited_resources'
 gem 'will_paginate', '~> 3.0'
 gem 'ransack'
 gem 'squeel'
-#gem 'ninoxe', '0.1.1'
-gem 'ninoxe', :git => 'git://github.com/dryade/ninoxe.git'
+gem 'ninoxe', '0.1.2'
 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 0ec770ecd..9aebe2e77 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,13 +1,3 @@
-GIT
-  remote: git://github.com/dryade/ninoxe.git
-  revision: fbbc73d923d398a4b349839d2e45e443a2acb5b8
-  specs:
-    ninoxe (0.1.2)
-      activerecord (>= 3.1.3)
-      acts_as_list (= 0.1.6)
-      foreigner (= 1.4.0)
-      georuby-ext (= 0.0.2)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -190,6 +180,11 @@ GEM
     net-ssh (2.6.2)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
+    ninoxe (0.1.2)
+      activerecord (>= 3.1.3)
+      acts_as_list (= 0.1.6)
+      foreigner (= 1.4.0)
+      georuby-ext (= 0.0.2)
     nokogiri (1.5.9)
     nokogiri (1.5.9-java)
     open4 (1.3.0)
@@ -348,7 +343,7 @@ DEPENDENCIES
   launchy
   map_layers (= 0.0.4)
   modernizr-rails (~> 2.0.6)
-  ninoxe!
+  ninoxe (= 0.1.2)
   pg (~> 0.11.0)
   rabl
   rails (= 3.2.6)