diff options
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 31 |
2 files changed, 14 insertions, 21 deletions
@@ -115,8 +115,8 @@ gem 'squeel' gem 'enumerize', '~> 0.10.0' -gem 'ninoxe', :git => 'https://github.com/afimb/ninoxe.git' -#gem 'ninoxe', '1.2.2' +#gem 'ninoxe', :git => 'https://github.com/afimb/ninoxe.git' +gem 'ninoxe', '1.2.3' #gem 'ninoxe',:path => '~/workspace/chouette/ninoxe' gem 'acts_as_list', '~> 0.6.0' diff --git a/Gemfile.lock b/Gemfile.lock index 319c0ce14..652a04087 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,3 @@ -GIT - remote: https://github.com/afimb/ninoxe.git - revision: 766d2293bde741d34a5b9f23da21e5dc8d66bb2f - specs: - ninoxe (1.2.1) - 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/ @@ -106,8 +92,7 @@ GEM coffee-script-source (1.9.1) daemons (1.1.9) database_cleaner (1.4.1) - dbf (2.0.10) - fastercsv (~> 1.5) + dbf (3.0.0) debug_inspector (0.0.2) deep_cloneable (2.0.2) activerecord (>= 3.1.0, < 5.0.0) @@ -149,7 +134,6 @@ GEM multipart-post (>= 1.2, < 3) faraday_middleware (0.9.1) faraday (>= 0.7.4, < 0.10) - fastercsv (1.5.5) ffi (1.9.10) ffi (1.9.10-java) ffi-geos (1.1.0) @@ -247,7 +231,7 @@ GEM mime-types (2.4.3) mimemagic (0.3.0) mini_portile (0.6.2) - minitest (5.8.1) + minitest (5.8.2) modernizr-rails (2.0.6) multi_json (1.11.2) multipart-post (2.0.0) @@ -260,6 +244,15 @@ GEM net-ssh-gateway (1.2.0) net-ssh (>= 2.6.5) newrelic_rpm (3.9.6.257) + ninoxe (1.2.3) + 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) @@ -534,7 +527,7 @@ DEPENDENCIES mimemagic modernizr-rails (~> 2.0.6) newrelic_rpm - ninoxe! + ninoxe (= 1.2.3) pg poltergeist pry-rails |