From 0cf96edd6993b9ec98a0c0f844fcfb185f06e445 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Jul 2020 03:03:41 +0000 Subject: [PATCH 1/6] Bump lodash from 4.17.15 to 4.17.19 Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19) Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index efa0666d5..8bbe32da9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1061,9 +1061,9 @@ locate-path@^2.0.0: path-exists "^3.0.0" lodash@^4.17.14, lodash@^4.17.15: - version "4.17.15" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" - integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== + version "4.17.19" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" + integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== make-plural@~3.0.6: version "3.0.6" From 69373d3def34f9056e0fe751fd0ebc196070fc7c Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 13 Jul 2020 17:27:18 +0200 Subject: [PATCH 2/6] [bug] unable to seed the database --- CHANGELOG.md | 16 +--------------- db/seeds.rb | 2 +- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0117c7bb1..9f56d4ba4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,19 +1,6 @@ # Changelog Fab-manager -## v4.5.2 2020 July 1st - -- Fix a bug: unable to set stripe public key in production -- Fix a bug: health API is broken if ElasticSearch is not present -- Fix a bug: unable to sync members with stripe -- Fix a bug: version check is not working -- Fix a bug: enabling auth_provider from the tests happens twice in coverall context -- [TODO DEPLOY] `rails fablab:maintenance:clean_workers` - -## v4.5.1 2020 July 1st - -- Ability to run the upgrade without interactions -- Fix a bug: Unable to access the invoices section if no stripe key was set or incorrect -- Fix a bug: task env_to_db overrides the values set in the UI, even if the corresponding variable was not defined in the env file +- Fix a bug: unable to seed the database ## v4.5.0 2020 June 30 @@ -37,7 +24,6 @@ - Fix a security issue: updated rack to 2.2.3 to fix [CVE-2020-8184](https://nvd.nist.gov/vuln/detail/CVE-2020-8184) - [TODO DEPLOY] add the `POSTGRESQL_LANGUAGE_ANALYZER` environment variable (see [doc/environment.md](doc/environment.md#POSTGRESQL_LANGUAGE_ANALYZER) for configuration details) - [TODO DEPLOY] `rails fablab:setup:env_to_db` -- [TODO DEPLOY] `rails db:seed` - [TODO DEPLOY] `\curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/scripts/redis-upgrade.sh | bash` - [TODO DEPLOY] -> (only dev) upgrade redis to v6, you may be able to use the script above, depending on your installation diff --git a/db/seeds.rb b/db/seeds.rb index 32a798a6c..6323770f1 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -603,7 +603,7 @@ Setting.set('invoice_VAT-active', false) unless Setting.find_by(name: 'invoice_V Setting.set('invoice_VAT-rate', 20.0) unless Setting.find_by(name: 'invoice_VAT-rate').try(:value) -Setting.set('invoice_text', t('invoices.invoice_text_example')) unless Setting.find_by(name: 'invoice_text').try(:value) +Setting.set('invoice_text', I18n.t('invoices.invoice_text_example')) unless Setting.find_by(name: 'invoice_text').try(:value) unless Setting.find_by(name: 'invoice_legals').try(:value) setting = Setting.find_or_initialize_by(name: 'invoice_legals') From 956ec553ef0a4d49c370898c5229bea9ca35c0bc Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 13 Jul 2020 17:37:39 +0200 Subject: [PATCH 3/6] Documentation of the easy upgrade procedure --- CHANGELOG.md | 1 + doc/production_readme.md | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f56d4ba4..a1a0fb731 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Changelog Fab-manager +- Documentation of the easy upgrade procedure - Fix a bug: unable to seed the database ## v4.5.0 2020 June 30 diff --git a/doc/production_readme.md b/doc/production_readme.md index ef4acbfb4..820e6c300 100644 --- a/doc/production_readme.md +++ b/doc/production_readme.md @@ -132,6 +132,27 @@ docker-compose ps docker-compose run --rm -e VAR1=xxx -e VAR2=xxx fabmanager bundle exec rails my:command ``` + +## Easy upgrade + +Starting with Fab-manager v4.5.0, you can upgrade Fab-manager in one single easy command, that automates the procedure below. +To upgrade with ease, using this helper, read the GitHub release notes of the version between your current version and the target version. + +**You MUST append all the arguments** of easy upgrade commands, for **each versions**, to the command you run. + +Eg. +If you upgrade from 1.2.3 to 1.2.5, with the following release notes: +```markdown +## 1.2.4 +\curl -sSL upgrade.fab-manager.com | bash -s -- -e "VAR=value" +## 1.2.5 +\curl -sSL upgrade.fab-manager.com | bash -s -- -c "rails fablab:setup:command" +``` +Then, you'll need to perform the upgrade with the following command: +```bash +\curl -sSL upgrade.fab-manager.com | bash -s -- -e "VAR=value" -c "rails fablab:setup:command" +``` + ## Update Fab-manager *This procedure updates Fab-manager to the most recent version by default.* From 2f3e910a023818b13f8c73e99c45cfbabad09c93 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 13 Jul 2020 17:48:16 +0200 Subject: [PATCH 4/6] partialy reverts 52fa10fc3a18ec781a136c5e23609f31b13665dd (erronous deletions) --- CHANGELOG.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1a0fb731..6ab837a6b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,21 @@ - Documentation of the easy upgrade procedure - Fix a bug: unable to seed the database +## v4.5.2 2020 July 1st + +- Fix a bug: unable to set stripe public key in production +- Fix a bug: health API is broken if ElasticSearch is not present +- Fix a bug: unable to sync members with stripe +- Fix a bug: version check is not working +- Fix a bug: enabling auth_provider from the tests happens twice in coverall context +- [TODO DEPLOY] `rails fablab:maintenance:clean_workers` + +## v4.5.1 2020 July 1st + +- Ability to run the upgrade without interactions +- Fix a bug: Unable to access the invoices section if no stripe key was set or incorrect +- Fix a bug: task env_to_db overrides the values set in the UI, even if the corresponding variable was not defined in the env file + ## v4.5.0 2020 June 30 - Search in the projets directly from PostgreSQL @@ -25,6 +40,7 @@ - Fix a security issue: updated rack to 2.2.3 to fix [CVE-2020-8184](https://nvd.nist.gov/vuln/detail/CVE-2020-8184) - [TODO DEPLOY] add the `POSTGRESQL_LANGUAGE_ANALYZER` environment variable (see [doc/environment.md](doc/environment.md#POSTGRESQL_LANGUAGE_ANALYZER) for configuration details) - [TODO DEPLOY] `rails fablab:setup:env_to_db` +- [TODO DEPLOY] `rails db:seed` - [TODO DEPLOY] `\curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/scripts/redis-upgrade.sh | bash` - [TODO DEPLOY] -> (only dev) upgrade redis to v6, you may be able to use the script above, depending on your installation From 382f38c6665432ec7f0948f89e903bb664895323 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 21 Jul 2020 09:13:20 +0200 Subject: [PATCH 5/6] updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ab837a6b..f6ba642b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ - Documentation of the easy upgrade procedure - Fix a bug: unable to seed the database +- Fix a security issue: updated lodash to 4.17.19 to fix [lodash#4744](https://github.com/lodash/lodash/issues/4744) ## v4.5.2 2020 July 1st From ad14b02caa51d9245623a8c30cbc039ec1594e42 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 21 Jul 2020 09:52:03 +0200 Subject: [PATCH 6/6] Version 4.5.3 --- CHANGELOG.md | 2 ++ package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6ba642b9..4a2d5be27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog Fab-manager +## v4.5.3 2020 July 21 + - Documentation of the easy upgrade procedure - Fix a bug: unable to seed the database - Fix a security issue: updated lodash to 4.17.19 to fix [lodash#4744](https://github.com/lodash/lodash/issues/4744) diff --git a/package.json b/package.json index 2f6634ea9..647d12ba6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fab-manager", - "version": "4.5.2", + "version": "4.5.3", "description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.", "keywords": [ "fablab",