1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-17 06:52:27 +01:00

Merge branch 'dev' for release 4.4.4

This commit is contained in:
Sylvain 2020-05-25 12:28:45 +02:00
commit 92b9ac4030
4 changed files with 8 additions and 4 deletions

View File

@ -1,5 +1,9 @@
# Changelog Fab-manager
## v4.4.4 2020 May 25
- Fix a security issue: updated puma from 3.12.4 to 3.12.6 to fix [CVE-2020-11077](https://nvd.nist.gov/vuln/detail/CVE-2020-11077) and [CVE-2020-11076](https://nvd.nist.gov/vuln/detail/CVE-2020-11076)
## v4.4.3 2020 May 25
- Fix a bug: recurrent availabilities do not keep the custom duration

View File

@ -12,7 +12,7 @@ gem 'rails', '~> 5.2.4'
# Used by rails 5.2 to reduce the app boot time by over 50%
gem 'bootsnap'
# Use Puma as web server
gem 'puma', '3.12.4'
gem 'puma', '3.12.6'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0', '>= 5.0.6'

View File

@ -291,7 +291,7 @@ GEM
prawn-table (0.2.2)
prawn (>= 1.3.0, < 3.0.0)
public_suffix (4.0.3)
puma (3.12.4)
puma (3.12.6)
pundit (2.1.0)
activesupport (>= 3.0.0)
raabro (1.1.6)
@ -501,7 +501,7 @@ DEPENDENCIES
pg
prawn
prawn-table
puma (= 3.12.4)
puma (= 3.12.6)
pundit
railroady
rails (~> 5.2.4)

View File

@ -1,6 +1,6 @@
{
"name": "fab-manager",
"version": "4.4.3",
"version": "4.4.4",
"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",