diff options
| author | Marc Florisson | 2015-02-27 18:30:40 +0100 |
|---|---|---|
| committer | Marc Florisson | 2015-02-27 18:30:40 +0100 |
| commit | 61532f983e81f9be680f4e8fd663cb3961f72616 (patch) | |
| tree | a3621af3f1f4db86564201c45a2b955f7a282ac7 | |
| parent | bece473af0d86e25d59378ea0f42965e63a315bc (diff) | |
| download | chouette-core-61532f983e81f9be680f4e8fd663cb3961f72616.tar.bz2 | |
update ninoxe version, use 1.1.5
| -rw-r--r-- | Gemfile | 5 | ||||
| -rw-r--r-- | Gemfile.lock | 28 |
2 files changed, 12 insertions, 21 deletions
@@ -76,10 +76,7 @@ gem 'google-analytics-rails' gem 'will_paginate', '~> 3.0' gem 'ransack' gem 'squeel' -gem 'ninoxe', :git => 'https://github.com/afimb/ninoxe.git', :branch => 'footnotes' -#gem 'ninoxe', :git => 'https://github.com/afimb/ninoxe.git' -#gem 'ninoxe',:path => '~/workspace/chouette/ninoxe' -#gem 'ninoxe', '1.1.5' +gem 'ninoxe', '1.1.5' 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 aacd25631..d1c830568 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,18 +1,3 @@ -GIT - remote: https://github.com/afimb/ninoxe.git - revision: b612664e38a1c1e778d19875a9975c98e468e106 - branch: footnotes - specs: - ninoxe (1.1.4) - 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) - enumerize (~> 0.8.0) - foreigner (= 1.6.0) - georuby-ext (= 0.0.5) - GEM remote: http://rubygems.org/ remote: https://rails-assets.org/ @@ -54,7 +39,7 @@ GEM activesupport (3.2.18) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) - acts-as-taggable-on (3.4.3) + acts-as-taggable-on (3.4.4) activerecord (>= 3.2, < 5) acts_as_list (0.1.6) acts_as_tree-1.8 (1.1.0) @@ -223,6 +208,15 @@ GEM net-ssh-gateway (1.1.0) net-ssh (>= 1.99.1) netrc (0.7.9) + ninoxe (1.1.5) + 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) + enumerize (~> 0.8.0) + foreigner (= 1.6.0) + georuby-ext (= 0.0.5) nokogiri (1.5.10) nokogiri (1.5.10-java) open4 (1.3.0) @@ -435,7 +429,7 @@ DEPENDENCIES meta_request modernizr-rails (~> 2.0.6) morrisjs-rails - ninoxe! + ninoxe (= 1.1.5) pg (~> 0.11.0) rabl rails (= 3.2.18) |