Merge pull request #3354 from DMPRoadmap/development

Development

.github/workflows/postgres.yml

@@ -37,10 +37,10 @@ jobs:
       with:
         ruby-version: '3.0'
         bundler-cache: true
-        
-    ## - run: echo 'NODE_OPTIONS="--openssl-legacy-provider"' >> $GITHUB_ENV 
+
+    ## - run: echo 'NODE_OPTIONS="--openssl-legacy-provider"' >> $GITHUB_ENV
     ## /home/runner/runners/2.301.1/externals/node12/bin/node: --openssl-legacy-provider is not allowed in NODE_OPTIONS
- 
+
     # Install Node
     - uses: actions/setup-node@v3
       with:

.gitignore

@@ -114,6 +114,7 @@ yarn-debug.log*
 .yarn-integrity
 /app/assets/builds/*
 !/app/assets/builds/.keep
+!/app/assets/builds/.gitkeep
 
 # Ignore briley AWS cloud9 script to start the application
 cloud9-start.sh

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## V4.1.1
+
+### Added
+- Added `MORE_INFO` and `LESS_INFO` JS constants (for the Research Outputs feature)
+- Added a .gitkeep file to the app/assets/builds directory to address potential issues when building the application.css file during production deploys #3314
+
+### Fixed
+- Updated the default font on the 'Download page' to be 'Roboto, Arial, Sans-Serif'
+- Fixed an issue with API V0 that was causing a 500 Internal Server error
+- Solved issue where spring was loaded in production mode : ran `bin/spring binstub --all`
+- Updated fontawesome to V6
+
+
 ## v4.1.0
 
 **Note this upgrade is a migration from Ruby v2.7.6 to v3.0.5.** Note that this could have an impact on any customizations you may have made to your fork of this project. Please see https://www.fastruby.io/blog/ruby/upgrades/upgrade-ruby-from-2.7-to-3.0.html for further information on what to check. In particular, please note the changes to the way [Ruby 3 handles keyword arguments](https://www.ruby-lang.org/en/news/2019/12/12/separation-of-positional-and-keyword-arguments-in-ruby-3-0/)
@@ -104,3 +117,4 @@ For more detailed explanation, please refer to this video : https://www.youtube.
 
 - Added scss files to EditorConfig
 - Change csv file name for statistics from 'Completed' to 'Created'
+- Added error message and updated saving message for plan writing session to improve user experience