From e91ce59d625734a0936a434b9e45fb2c48f0a5f8 Mon Sep 17 00:00:00 2001
From: Zog
Date: Wed, 31 Jan 2018 14:34:48 +0100
Subject: Fix Reflex import

---
 lib/stif/reflex_synchronization.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/stif/reflex_synchronization.rb b/lib/stif/reflex_synchronization.rb
index 39a92bd1f..7570e4c49 100644
--- a/lib/stif/reflex_synchronization.rb
+++ b/lib/stif/reflex_synchronization.rb
@@ -151,6 +151,7 @@ module Stif
 
       def create_or_update_stop_area entry
         stop = Chouette::StopArea.find_or_create_by(objectid: entry['id'], stop_area_referential: self.defaut_referential )
+        stop.kind = :commercial
         stop.deleted_at            = nil
         {
           :comment        => 'Description',
-- 
cgit v1.2.3


From 799e9dddd06d60d5e22ad4289c23534c107b40db Mon Sep 17 00:00:00 2001
From: Alban Peignier
Date: Thu, 1 Feb 2018 11:02:46 +0100
Subject: Add env variable to disable ci:jest if needed. Refs #5802

---
 lib/tasks/ci.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake
index 3e73b7a3b..82619d04b 100644
--- a/lib/tasks/ci.rake
+++ b/lib/tasks/ci.rake
@@ -38,7 +38,7 @@ namespace :ci do
   end
 
   task :jest => "ci:assets" do
-    sh "node_modules/.bin/jest"
+    sh "node_modules/.bin/jest" unless ["CHOUETTE_JEST_DISABLED"]
   end
 
   desc "Deploy after CI"
-- 
cgit v1.2.3


From 8f2a4ca4de2cac80eea379cba559124ee5dff403 Mon Sep 17 00:00:00 2001
From: Luc Donnet
Date: Thu, 1 Feb 2018 11:31:56 +0100
Subject: Fix yarn installation with no production for ci and force yarn
 install before jest launch du to webpacker bug

---
 lib/tasks/ci.rake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake
index 82619d04b..13d7b8d73 100644
--- a/lib/tasks/ci.rake
+++ b/lib/tasks/ci.rake
@@ -3,7 +3,7 @@ namespace :ci do
   task :setup do
     cp "config/database/jenkins.yml", "config/database.yml"
     sh "RAILS_ENV=test rake db:drop db:create db:migrate"
-    sh "yarn --production --no-progress install"
+    sh "yarn --no-progress install"
   end
 
   def git_branch
@@ -38,6 +38,7 @@ namespace :ci do
   end
 
   task :jest => "ci:assets" do
+    sh "yarn --no-progress install" # Hack to force install jest after webpack 
     sh "node_modules/.bin/jest" unless ["CHOUETTE_JEST_DISABLED"]
   end
 
-- 
cgit v1.2.3


From e07ef0eb9dac728ee5033b42c318692e2368b897 Mon Sep 17 00:00:00 2001
From: Luc Donnet
Date: Wed, 7 Feb 2018 16:38:06 +0100
Subject: Add workgroup to erd diagrams

---
 lib/tasks/erd.rake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/tasks/erd.rake b/lib/tasks/erd.rake
index e2665374e..96bb7fe37 100644
--- a/lib/tasks/erd.rake
+++ b/lib/tasks/erd.rake
@@ -2,12 +2,12 @@ namespace :generate do
 
   desc "Create model diagrams for Chouette"
   task :model_diagram  => :environment do
-    sh "bundle exec rake erd only='Organisation,Referential,User,Workbench' filename='organisation' title='Organisation'"
+    sh "bundle exec rake erd only='Organisation,Referential,User,Workbench,Workgroup' filename='organisation' title='Organisation'"
     sh "bundle exec rake erd only='Calendar,Referential,ReferentialMetadata,Chouette::Line,Chouette::Route,Chouette::JourneyPattern,Chouette::VehicleJourney,Chouette::VehicleJourneyAtStop,Chouette::TimeTable,Chouette::TimeTableDate,Chouette::TimeTablePeriod,Chouette::Footnote,Chouette::Network,Chouette::Company,Chouette::StopPoint,Chouette::StopArea' filename='offer_datas' title='Offer Datas'"
     sh "bundle exec rake erd only='Organisation,StopAreaReferential,StopAreaReferentialSync,StopAreaReferentialSyncMessage,StopAreaReferentialMembership,LineReferential,LineReferentialSync,LineReferentialSyncMessage,LineReferentialMembership' filename='referentiels_externes' title='Référentiels externes'"
     sh "bundle exec rake erd only='NetexImport,Import,WorkbenchImport,ImportResource,ImportMessage' filename='import' title='Import'"
     sh "bundle exec rake erd only='ComplianceControlSet,ComplianceControlBlock,ComplianceControl,ComplianceCheckSet,ComplianceCheckBlock,ComplianceCheck,ComplianceCheckResource,ComplianceCheckMessage' filename='validation' title='Validation'"
-    sh "bundle exec rake erd only='Organisation,Workbench,ReferentialSuite,Referential' filename='merge' title='Merge'"
+    sh "bundle exec rake erd only='Organisation,Workgroup,Workbench,ReferentialSuite,Referential' filename='merge' title='Merge'"
     #sh "bundle exec rake erd only='VehicleJourney,VehicleJourneyExport' filename='export' title='Export'"
     #sh "bundle exec rake erd only='' filename='integration' title='Integration'"
     #sh "bundle exec rake erd only='' filename='publication' title='Publication'"
-- 
cgit v1.2.3