From 6ae5ffb2c6650b87642cdddbc8186f02c9fa53db Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Mon, 24 Dec 2018 18:10:27 +0100 Subject: [PATCH 1/4] Use ruby 2.6 --- .circleci/config.yml | 2 +- .ruby-version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8347965d0..b9f92a247 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2 defaults: &defaults working_directory: ~/tps docker: - - image: circleci/ruby:2.5.0-node-browsers + - image: circleci/ruby:2.6.0-node-browsers - image: circleci/postgres:9.5 environment: POSTGRES_USER: tps_test diff --git a/.ruby-version b/.ruby-version index 437459cd9..e70b4523a 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.5.0 +2.6.0 From 27460b55a3d3cfb2a0e4a6e81a5cb47c547f7c92 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Mon, 24 Dec 2018 16:46:11 +0100 Subject: [PATCH 2/4] Use the new merge with multiple arguments --- app/services/api_entreprise_service.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/services/api_entreprise_service.rb b/app/services/api_entreprise_service.rb index 0dec08efc..e984ebe9e 100644 --- a/app/services/api_entreprise_service.rb +++ b/app/services/api_entreprise_service.rb @@ -7,10 +7,11 @@ class ApiEntrepriseService association_params = ApiEntreprise::RNAAdapter.new(siret, procedure_id).to_params exercices_params = ApiEntreprise::ExercicesAdapter.new(siret, procedure_id).to_params - etablissement_params - .merge(entreprise_params) - .merge(association_params) - .merge(exercices_params) + etablissement_params.merge( + entreprise_params, + association_params, + exercices_params + ) end end end From cfcbe45695fe940bc0b9a717a3cc62a4825c83a6 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Sat, 5 Jan 2019 11:39:02 +0100 Subject: [PATCH 3/4] Bump the bundler version --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b973dc7d7..c9f39191f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -740,4 +740,4 @@ DEPENDENCIES zxcvbn-ruby BUNDLED WITH - 1.17.1 + 1.17.2 From 1be87b4b78ee30b0f83b73eb820c971a40b5dd1f Mon Sep 17 00:00:00 2001 From: Mathieu Magnin Date: Mon, 25 Feb 2019 17:16:50 +0100 Subject: [PATCH 4/4] Ruby 2.6.1 --- .circleci/config.yml | 2 +- .ruby-version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b9f92a247..eb8386573 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2 defaults: &defaults working_directory: ~/tps docker: - - image: circleci/ruby:2.6.0-node-browsers + - image: circleci/ruby:2.6.1-node-browsers - image: circleci/postgres:9.5 environment: POSTGRES_USER: tps_test diff --git a/.ruby-version b/.ruby-version index e70b4523a..6a6a3d8e3 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.6.0 +2.6.1