diff --git a/CHANGELOG.md b/CHANGELOG.md index 0117c7bb1..4a2d5be27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # 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) + ## v4.5.2 2020 July 1st - Fix a bug: unable to set stripe public key in production 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') 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.* 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", 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"