diff options
| author | Michel Etienne | 2014-11-14 11:41:10 +0100 |
|---|---|---|
| committer | Michel Etienne | 2014-11-14 11:41:10 +0100 |
| commit | 621f2e739c3a3dd4a6bbbc76256b05829e4ab5f5 (patch) | |
| tree | fc1abb876a3272c012000202cd71baa2e378f7b9 | |
| parent | 96f119e78ddd0f4967e48b8ba7a064e9f332e212 (diff) | |
| parent | 40ce5ebfe44178b04ee2175c7a8bdff46564df76 (diff) | |
| download | chouette-core-621f2e739c3a3dd4a6bbbc76256b05829e4ab5f5.tar.bz2 | |
Merge branch 'V2_5'
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 26 | ||||
| -rw-r--r-- | config/deploy/unstable.rb | 2 |
3 files changed, 13 insertions, 19 deletions
@@ -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) diff --git a/config/deploy/unstable.rb b/config/deploy/unstable.rb index 0c19b9fbc..d8d5d30bc 100644 --- a/config/deploy/unstable.rb +++ b/config/deploy/unstable.rb @@ -1,2 +1,2 @@ server "chouette-p.aix.cityway.fr", :app, :web, :db, :primary => true -set :branch, "sismo" +set :branch, "V2_5" |