Merge Upstream Releases v4.1.0 and v4.1.1 - Githubissues

portagenetwork / roadmap

Developed by the the Alliance in collaboration with University of Alberta, DMP Assistant a data management planning tool, forking the DMP Roadmap codebase

MIT License

6 stars 1 forks source link

Merge Upstream Releases v4.1.0 and v4.1.1 #700

Closed aaronskiba closed 1 month ago

aaronskiba commented 3 months ago

Changes proposed in this PR:

Merge upstream releases v4.1.0 and v4.1.1
- DMPRoadmap v4.1.0 Release Notes
- DMPRoadmap v4.1.1 Release Notes
- Notes Regarding Merge Conflicts and Their Resolutions
- There were two notable challenges during the merge of this release:
  1. The tests within ./spec/features/ were not initially working. This PR includes the fixes for those tests.
  2. The changes within app/assets/stylesheets/ undid a lot of our previous styling. This PR includes fixes for that. The approach for that was largely copied from the changes within the following DMPRoadmap PR: https://github.com/DMPRoadmap/roadmap/pull/3374

github-actions[bot] commented 3 months ago

	1 Warning
:warning:	This PR is too big! Consider breaking it down into smaller PRs.

Generated by :no_entry_sign: Danger