Merge branch 'master' into 3562_ccset_affectation3562_ccset_affectation

6 files changed, 13 insertions, 2 deletions

diff --git a/config/deploy.rb b/config/deploy.rb
index 3353b4186..833ecfbbe 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -104,6 +104,6 @@ namespace :deploy do
 
   desc "Run db:seed"
   task :seed do
-    run "cd #{release_path} && RAILS_ENV=#{rails_env} #{rake} db:seed"
+    run "cd #{current_path} && RAILS_ENV=#{rails_env} #{rake} db:seed"
   end
 end
diff --git a/config/locales/journey_patterns.en.yml b/config/locales/journey_patterns.en.yml
index e5248c29c..9d9bc21e2 100644
--- a/config/locales/journey_patterns.en.yml
+++ b/config/locales/journey_patterns.en.yml
@@ -6,6 +6,7 @@ en:
       vehicle_journeys_count: "Vehicle journeys: %{count}"
       vehicle_journey_at_stops: "Vehicle journey at stops"
     actions:
+      index: "Journey patterns"
       new: "Add a new journey_pattern"
       edit: "Edit this journey pattern"
       destroy: "Remove this journey pattern"
diff --git a/config/locales/stop_points.en.yml b/config/locales/stop_points.en.yml
index d22d85731..72e138270 100644
--- a/config/locales/stop_points.en.yml
+++ b/config/locales/stop_points.en.yml
@@ -55,3 +55,4 @@ en:
         name: Stop Point
         for_boarding: "Pickup"
         for_alighting: "Drop off"
+        reflex_id: ID
diff --git a/config/locales/stop_points.fr.yml b/config/locales/stop_points.fr.yml
index d3c873442..71be684f6 100644
--- a/config/locales/stop_points.fr.yml
+++ b/config/locales/stop_points.fr.yml
@@ -52,6 +52,7 @@ fr:
   simple_form:
     labels:
       stop_point:
-        name: Arrêt 
+        name: Arrêt
         for_boarding: "Montée"
         for_alighting: "Descente"
+        reflex_id: ID
diff --git a/config/routes.rb b/config/routes.rb
index 681b36c59..b01bba18d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -256,4 +256,6 @@ ChouetteIhm::Application.routes.draw do
   match '/422', to: 'errors#server_error', via: :all, as: 'unprocessable_entity'
   match '/500', to: 'errors#server_error', via: :all, as: 'server_error'
 
+  match '/status', to: 'statuses#index', via: :get
+
 end
diff --git a/config/schedule.rb b/config/schedule.rb
index 08488c255..0d2a24f31 100644
--- a/config/schedule.rb
+++ b/config/schedule.rb
@@ -40,9 +40,15 @@ every :day, :at => '4:00 am' do
 end
 
 every 5.minutes do
+  rake "import:netex_abort_old"
   rake "import:notify_parent"
 end
 
+every 5.minutes do
+  rake "compliance_check_sets:abort_old"
+  rake "compliance_check_sets:notify_parent"
+end
+
 every 1.minute do
   command "/bin/echo HeartBeat"
 end