conflicts resolved

4 files changed, 14 insertions, 1 deletions

diff --git a/config/deploy.rb b/config/deploy.rb
index 78def7de7..0445ec480 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -12,7 +12,7 @@ set :group_writable, true
 set :bundle_cmd, "/var/lib/gems/2.2.0/bin/bundle"
 set :rake, "#{bundle_cmd} exec /var/lib/gems/2.2.0/bin/rake"
 
-set :keep_releases, 5
+set :keep_releases, -> { fetch(:kept_releases, 5) }
 after "deploy:restart", "deploy:cleanup"
 
 set :rails_env, -> { fetch(:stage) }
diff --git a/config/deploy/dev.rb b/config/deploy/dev.rb
index 400f1d787..5150311e9 100644
--- a/config/deploy/dev.rb
+++ b/config/deploy/dev.rb
@@ -1 +1,2 @@
 server "stif-boiv-dev.af83.priv", :app, :web, :db, :primary => true
+set :kept_releases, 2
diff --git a/config/locales/journey_patterns.en.yml b/config/locales/journey_patterns.en.yml
index d62d79e58..80adc2337 100644
--- a/config/locales/journey_patterns.en.yml
+++ b/config/locales/journey_patterns.en.yml
@@ -24,6 +24,12 @@ en:
     form:
       warning: "Be careful, selection is also applied to the %{count} vehicle journeys associated to this journey pattern"
   activerecord:
+    errors:
+      models:
+        journey_pattern:
+          attributes:
+            stop_points:
+              minimum: 'Must at least have two stop points'
     models:
       journey_pattern:
         zero:  "journey pattern"
diff --git a/config/locales/journey_patterns.fr.yml b/config/locales/journey_patterns.fr.yml
index 39005e464..0dceb2f43 100644
--- a/config/locales/journey_patterns.fr.yml
+++ b/config/locales/journey_patterns.fr.yml
@@ -24,6 +24,12 @@ fr:
     form:
       warning: "Attention, la sélection s'applique aussi aux %{count} courses de la mission"
   activerecord:
+    errors:
+      models:
+        journey_pattern:
+          attributes:
+            stop_points:
+              minimum: 'Une mission doit avoir au minimum deux arrêts'
     models:
       journey_pattern:
         zero:  "mission"