diff options
| author | Michel Etienne | 2015-11-25 10:34:12 +0100 |
|---|---|---|
| committer | Michel Etienne | 2015-11-25 10:34:12 +0100 |
| commit | db3b4e81afad405179be844ea752e740d433d88d (patch) | |
| tree | cab59cab0536d2350e6f8f4ee8b42e47ca80eccf | |
| parent | 3d7e1ff4cacfd43900ce4b58ace80cf9775fbc01 (diff) | |
| download | chouette-core-db3b4e81afad405179be844ea752e740d433d88d.tar.bz2 | |
deploy on preview
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | config/deploy/unstable.rb | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -92,7 +92,7 @@ gem 'squeel' gem 'enumerize', '~> 0.10.0' #gem 'ninoxe', '1.2.4' -gem 'ninoxe', github: 'afimb/ninoxe' +gem 'ninoxe', git: 'https://github.com/afimb/ninoxe.git' #gem 'ninoxe', path: '../ninoxe' gem 'acts_as_list', '~> 0.6.0' diff --git a/Gemfile.lock b/Gemfile.lock index 590b13326..55a4317b6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT - remote: git://github.com/afimb/ninoxe.git - revision: 3ff5fe2e7a9b530bdfca3b8703a5ec70d9d48978 + remote: https://github.com/afimb/ninoxe.git + revision: 427e887260845b8dc24b40831021caeebf34ab32 specs: ninoxe (1.2.4) activerecord (~> 4.1.1) diff --git a/config/deploy/unstable.rb b/config/deploy/unstable.rb index 4fab428c7..d363a6fa4 100644 --- a/config/deploy/unstable.rb +++ b/config/deploy/unstable.rb @@ -1,3 +1,3 @@ server "chouette-p.aix.cityway.fr", :app, :web, :db, :primary => true -set :branch, "V3_1" +set :branch, "master" #set :gui_cmd, "2.5.2" |