diff options
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 25 | 
2 files changed, 17 insertions, 12 deletions
| @@ -92,8 +92,8 @@ gem 'squeel'  gem 'enumerize', '~> 0.10.0' -gem 'ninoxe', '1.2.4' -#gem 'ninoxe', github: 'afimb/ninoxe' +#gem 'ninoxe', '1.2.4' +gem 'ninoxe', github: 'afimb/ninoxe'  #gem 'ninoxe', path: '../ninoxe'  gem 'acts_as_list', '~> 0.6.0' diff --git a/Gemfile.lock b/Gemfile.lock index 6be7ca18f..0fc14a14c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,17 @@ +GIT +  remote: git://github.com/afimb/ninoxe.git +  revision: 3ff5fe2e7a9b530bdfca3b8703a5ec70d9d48978 +  specs: +    ninoxe (1.2.4) +      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/ @@ -243,15 +257,6 @@ 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) @@ -526,7 +531,7 @@ DEPENDENCIES    meta_request    mimemagic    newrelic_rpm -  ninoxe (= 1.2.3) +  ninoxe!    pg    poltergeist    pry-rails | 
