From 5d4cf0d1f659afc89e431919c759b0551d0d8008 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Jun 2020 09:16:25 +0000 Subject: [PATCH 1/2] build(deps): bump geocoder from 1.6.0 to 1.6.1 Bumps [geocoder](https://github.com/alexreisner/geocoder) from 1.6.0 to 1.6.1. - [Release notes](https://github.com/alexreisner/geocoder/releases) - [Changelog](https://github.com/alexreisner/geocoder/blob/master/CHANGELOG.md) - [Commits](https://github.com/alexreisner/geocoder/compare/v1.6.0...v1.6.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 143c83271..6fd9b7f5e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -245,7 +245,7 @@ GEM et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.1) geo_coord (0.1.0) - geocoder (1.6.0) + geocoder (1.6.1) globalid (0.4.2) activesupport (>= 4.2.0) gon (6.3.2) From 8b802ae2c8b7fffcbc195c98646ea305669d641b Mon Sep 17 00:00:00 2001 From: Christophe Robillard Date: Thu, 11 Jun 2020 12:33:29 +0200 Subject: [PATCH 2/2] add destroy dependent option for exports --- app/models/groupe_instructeur.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/groupe_instructeur.rb b/app/models/groupe_instructeur.rb index dabed2793..82ddd9406 100644 --- a/app/models/groupe_instructeur.rb +++ b/app/models/groupe_instructeur.rb @@ -4,7 +4,7 @@ class GroupeInstructeur < ApplicationRecord has_many :assign_tos, dependent: :destroy has_many :instructeurs, through: :assign_tos has_many :dossiers - has_and_belongs_to_many :exports + has_and_belongs_to_many :exports, dependent: :destroy validates :label, presence: { message: 'doit être renseigné' }, allow_nil: false validates :label, uniqueness: { scope: :procedure, message: 'existe déjà' }