Skip to content

Commit 8a0d0fb

Browse files
authored
Merge pull request #3354 from DMPRoadmap/development
Development
2 parents 0cdd9f4 + ba149a0 commit 8a0d0fb

File tree

35 files changed

+352
-275
lines changed

35 files changed

+352
-275
lines changed

.github/workflows/postgres.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ jobs:
3737
with:
3838
ruby-version: '3.0'
3939
bundler-cache: true
40-
41-
## - run: echo 'NODE_OPTIONS="--openssl-legacy-provider"' >> $GITHUB_ENV
40+
41+
## - run: echo 'NODE_OPTIONS="--openssl-legacy-provider"' >> $GITHUB_ENV
4242
## /home/runner/runners/2.301.1/externals/node12/bin/node: --openssl-legacy-provider is not allowed in NODE_OPTIONS
43-
43+
4444
# Install Node
4545
- uses: actions/setup-node@v3
4646
with:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ yarn-debug.log*
114114
.yarn-integrity
115115
/app/assets/builds/*
116116
!/app/assets/builds/.keep
117+
!/app/assets/builds/.gitkeep
117118

118119
# Ignore briley AWS cloud9 script to start the application
119120
cloud9-start.sh

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Changelog
22

3+
## V4.1.1
4+
5+
### Added
6+
- Added `MORE_INFO` and `LESS_INFO` JS constants (for the Research Outputs feature)
7+
- Added a .gitkeep file to the app/assets/builds directory to address potential issues when building the application.css file during production deploys #3314
8+
9+
### Fixed
10+
- Updated the default font on the 'Download page' to be 'Roboto, Arial, Sans-Serif'
11+
- Fixed an issue with API V0 that was causing a 500 Internal Server error
12+
- Solved issue where spring was loaded in production mode : ran `bin/spring binstub --all`
13+
- Updated fontawesome to V6
14+
15+
316
## v4.1.0
417

518
**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.
104117

105118
- Added scss files to EditorConfig
106119
- Change csv file name for statistics from 'Completed' to 'Created'
120+
- Added error message and updated saving message for plan writing session to improve user experience

0 commit comments

Comments
 (0)