aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Etienne2014-04-29 15:45:21 +0200
committerMichel Etienne2014-04-29 15:45:21 +0200
commitf4070ce6c81d33b1bd0e51196db8a05f41c36dfa (patch)
tree5d4d7dd3d7fb7036e06a41693a24ea13b039ef0e
parent893745898be4869370f5aa1a8c489814fa006ca8 (diff)
downloadchouette-core-f4070ce6c81d33b1bd0e51196db8a05f41c36dfa.tar.bz2
set ninoxe ref on https for deploy
-rw-r--r--Gemfile2
-rw-r--r--config/deploy/staging.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 176514810..91a2a41fa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,7 @@ gem 'google-analytics-rails'
gem 'will_paginate', '~> 3.0'
gem 'ransack'
gem 'squeel'
-gem 'ninoxe', :git => 'git://github.com/afimb/ninoxe.git'
+gem 'ninoxe', :git => 'https://github.com/afimb/ninoxe.git'
#gem 'ninoxe',:path => '~/workspace/chouette/ninoxe'
#gem 'ninoxe', '0.1.7'
diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb
index 41cedd594..a4519644b 100644
--- a/config/deploy/staging.rb
+++ b/config/deploy/staging.rb
@@ -3,4 +3,4 @@ set :deploy_via, :copy
set :copy_cache, true
set :copy_via, :scp
set :copy_exclude, ".git/*"
-set :branch, "V2_1_0"
+set :branch, "V2_3_0"