Merge integration into deployment-portage for release 4.1.1+portage-4.7.0#1309
Merged
momo3404 merged 200 commits intodeployment-portagefrom Mar 17, 2026
Merged
Merge integration into deployment-portage for release 4.1.1+portage-4.7.0#1309momo3404 merged 200 commits intodeployment-portagefrom
integration into deployment-portage for release 4.1.1+portage-4.7.0#1309momo3404 merged 200 commits intodeployment-portagefrom
Conversation
Merge `deployment-portage` into `integration`
Bumps nginx from 1.29.3-alpine to 1.29.4-alpine. --- updated-dependencies: - dependency-name: nginx dependency-version: 1.29.4-alpine dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
…ation/nginx-1.29.4-alpine chore(deps): bump nginx from 1.29.3-alpine to 1.29.4-alpine
Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v5...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>
…s/integration/actions/checkout-6 chore(deps): bump actions/checkout from 5 to 6
Bumps [omniauth](https://github.com/omniauth/omniauth) from 2.1.2 to 2.1.4. - [Release notes](https://github.com/omniauth/omniauth/releases) - [Commits](omniauth/omniauth@v2.1.2...v2.1.4) --- updated-dependencies: - dependency-name: omniauth dependency-version: 2.1.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
…ration/omniauth-2.1.4 chore(deps): bump omniauth from 2.1.2 to 2.1.4
Bumps [browser-actions/setup-chrome](https://github.com/browser-actions/setup-chrome) from 1 to 2. - [Release notes](https://github.com/browser-actions/setup-chrome/releases) - [Changelog](https://github.com/browser-actions/setup-chrome/blob/master/CHANGELOG.md) - [Commits](browser-actions/setup-chrome@v1...v2) --- updated-dependencies: - dependency-name: browser-actions/setup-chrome dependency-version: '2' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>
…s/integration/browser-actions/setup-chrome-2 chore(deps): bump browser-actions/setup-chrome from 1 to 2
Bumps [webpack](https://github.com/webpack/webpack) from 5.94.0 to 5.102.1. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](webpack/webpack@v5.94.0...v5.102.1) --- updated-dependencies: - dependency-name: webpack dependency-version: 5.102.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…integration/webpack-5.102.1 chore(deps): bump webpack from 5.94.0 to 5.102.1
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 5 to 6. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](actions/setup-node@v5...v6) --- updated-dependencies: - dependency-name: actions/setup-node dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>
…s/integration/actions/setup-node-6 chore(deps): bump actions/setup-node from 5 to 6
- The base url "https://api.ror.org/" defaults to the V2 API
- In the V2 API, names now returns an array of names. The display_name helper function fetches the display name. - In the V2 API, there are now multiple links which can point to more than just the org's website. The helper function org_url retrieves the org's website. - parse_results is edited to use these helper functions in order to parse results properly. - Also fixed a comment typo.
- The function is updated to use the display_name helper function and comply with the V2 API schema.
- Languages were simplified in the v2 api and can now be extracted from names. - org_language was updated to do that.
- org_website was updated to use the org_url helper function.
- The external_ids schema was changed in the V2 API to use "type". fundref_id was updated to reflect this change, and simplify the logic of retrieving preferred and all ids.
- Update tests to follow new schema regarding names, external ids, and links.
- Remove the unnecessary hash check for items since links must be an array - Change org_url return value from links to website url to simplify use - Rename `display_name` to `sort_name` - Move functions below parse_results
- Removed the fundref case comparison since contract ensures it will always be 'fundref' - Removed the unnecessary all.first.present check - Removed redundant external_ids presence check since external_ids is guaranteed to be always present as an array, even if empty - Edited ror_service_spec tests to work with `fundref` and empty external_ids
…ation/nginx-1.29.6-alpine chore(deps): bump nginx from 1.29.5-alpine to 1.29.6-alpine
Commit 15e62ec revealed that the spec file was assigning an incorrect type to `cost[:value]`. - `Api::V2::PlanPresenter#plan_costs` assigns `cost[:value] = answer.text`(a String) The spec file now matches the actual assigned type.
API v2: Sanitize user-supplied fields in responses
- Adds custom accordion css for dropdown menus with text - Adds welcome features css for welcome page icons
- Add welcome banner and icons - Divide text into sections with custom accordion dropdowns
- Add new content and dropdowns for FAQs
- These paths were removed when the content for the pages they were in was updated
- Remove the pre-existing public DMPs and replace it with the Example DMPs that were previously put in the help page - Remove the example DMPs from the help page - Edit the title of the pages to 'Example DMPs' in the header and header navigation
- Add a list to store all example DMP titles and urls, then use a loop to list all
- It is preferrable to link to the DOIs instead of the zenodo record directly since the DOIs are more persistent - Incorrect links were provided previously so this commit ammends that
- Edit the header navigation and navigation htmls - Edit the help FAQ answers to creating a DMP
- in plans_spec: After the change, there were two 'create plan' links visible on a page, so the test could not correctly pick which one to click. The id 'create-plan-link' was added to the appropriate 'create plan' link and used in the tests to ensure the right link was clicked. - in locales_spec: The french translation was still for 'Create Plans' and was changed to 'Create Plan'
Redesign and Edit Welcome, Help, and About pages and Remove Public DMPs Page
Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.27.5 to 2.32.0. - [Release notes](https://github.com/import-js/eslint-plugin-import/releases) - [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md) - [Commits](import-js/eslint-plugin-import@v2.27.5...v2.32.0) --- updated-dependencies: - dependency-name: eslint-plugin-import dependency-version: 2.32.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…integration/eslint-plugin-import-2.32.0 chore(deps): bump eslint-plugin-import from 2.27.5 to 2.32.0
Update answer text on home page
Also added rSpec tests to verify: - the internal v2 access token expiry - verify `old_token` is revoked prior to `new_token` creation
Updated text so that it also communicates expiry time of v2 access token.
…piry Update expiry time of v2 API internal access token
Generated by 🚫 Danger |
aaronskiba
approved these changes
Mar 17, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Added
Add rake task to clean up unmanaged orgs w/ users #1250
Implement tiered Rack::Attack throttles #1254
Add Internal v2 API Access Token Generation for Users #1279
Add
bundle exec rails db:migrateto entrypoint.sh #1278Add copy button next to V2 API Token #1283
Initial v2 API Implementation & Doorkeeper OAuth Integration #1276
API v2: Sanitize user-supplied fields in responses #1303
Add v2 API documentation to API Access page #1300
Changed
Upgrade ROR API From V1 to V2 #1247
Update plan json export to use V2 API complete plan endpoint #1293
Redesign and Edit Welcome, Help, and About pages and Remove Public DMPs Page #1299
Dependency Updates
chore(deps): bump nginx from 1.29.3-alpine to 1.29.4-alpine #1246
chore(deps): bump actions/checkout from 5 to 6 #1236
chore(deps): bump omniauth from 2.1.2 to 2.1.4 #1201
chore(deps): bump browser-actions/setup-chrome from 1 to 2 #1138
chore(deps): bump webpack from 5.94.0 to 5.102.1 #1206
chore(deps): bump actions/setup-node from 5 to 6 #1211
chore(deps): bump surnet/alpine-wkhtmltopdf from 3.22.0-0.12.6-small to 3.23.2-0.12.6-small #1258
chore(deps): bump docker/login-action from 3.6.0 to 3.7.0 #1268
chore(deps): bump docker/build-push-action from 6.18.0 to 6.19.2 #1277
chore(deps): bump nginx from 1.29.4-alpine to 1.29.5-alpine #1271
bundle update httparty#1291chore(deps): bump docker/login-action from 3.7.0 to 4.0.0 #1290
chore(deps): bump docker/setup-buildx-action from 3 to 4 #1295
chore(deps): bump docker/metadata-action from 5 to 6 #1298
chore(deps): bump docker/build-push-action from 6.19.2 to 7.0.0 #1297
chore(deps): bump nginx from 1.29.5-alpine to 1.29.6-alpine #1302
chore(deps): bump eslint-plugin-import from 2.27.5 to 2.32.0 #1149