Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CHORE] [MER-3606] Integration v0.28.2 #5013

Merged
merged 45 commits into from
Aug 15, 2024
Merged

[CHORE] [MER-3606] Integration v0.28.2 #5013

merged 45 commits into from
Aug 15, 2024

Conversation

eliknebel
Copy link
Contributor

@eliknebel eliknebel commented Aug 12, 2024

NOTE: DO NOT SQUASH - Select "Merge Commit" when merging

Integrate hot fix v0.28.2 changes upstream to master.

dtiwarATS and others added 30 commits July 9, 2024 09:30
…er a component has been copied causes issues (#4955)

* MER-3423

* More changes

* More Changes

* trying to re-run checks

* Update EditingCanvas.tsx
…eys view

[BUG FIX] [MER-3434] Remove likert visualization from instructor surveys view
[BUG FIX] [MER-3393] Time restricted assessments no longer work rework
fix button padding
[ENHANCEMENT] [MER-3396] Async project export to fix gateway timeout
[ENHANCEMENT] [MER-3503] Add support for accessing research consent form
Co-authored-by: Raphael Gachuhi <rgachuhi@cmu.edu>
…sessment (#4971)

* handle attempt submitted state for manually graded activities

* fix test
…t work (#4979)

* MER-3506 Fix back link

* MER-3506 Add test

* MER-3506 Make more robust SetRequestPath plug
…Section and Project (#4991)

* [BUG FIX] [MER-3548] Change default analytic_version value to v2 for section and project

* [BUG FIX] [MER-3548] Add a new test and adjust existing tests
…d Home screen (#4992)

* handle case when days_difference datetime cannot be localized

* fix flaky test
…TI launch (#4994)

* remove institution_instructor role from list of allow_configure_section_roles

* skip flaky test

* bump version number
* [MER-3550] Adds agenda flag field to section

* [MER-3550] Adds button to toggle agenda field value

* [MER-3550] Renders agenda component conditionally

* [MER-3550] Adds tests
… link (#5003)

* [MER-3565] Fix page link error on activity rendering

* [MER-3565] Fix page link error on page rendering

* [MER-3565] Add missing props

* [MER-3565] Fix typescript tests

* [MER-3565] Update docker compose command in CI test runner
@eliknebel eliknebel marked this pull request as ready for review August 12, 2024 17:28
Copy link

gitguardian bot commented Aug 12, 2024

⚠️ GitGuardian has uncovered 1 secret following the scan of your pull request.

Please consider investigating the findings and remediating the incidents. Failure to do so may lead to compromising the associated services or software components.

🔎 Detected hardcoded secret in your pull request
GitGuardian id GitGuardian status Secret Commit Filename
10034199 Triggered Generic Password d682bc2 config/hound.exs View secret
🛠 Guidelines to remediate hardcoded secrets
  1. Understand the implications of revoking this secret by investigating where it is used in your code.
  2. Replace and store your secret safely. Learn here the best practices.
  3. Revoke and rotate this secret.
  4. If possible, rewrite git history. Rewriting git history is not a trivial act. You might completely break other contributing developers' workflow and you risk accidentally deleting legitimate data.

To avoid such incidents in the future consider


🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.

@eliknebel eliknebel changed the title [CHORE] [MER-XXXX] Integration v0.28.2 [CHORE] [MER-0000] Integration v0.28.2 Aug 12, 2024
@eliknebel eliknebel changed the title [CHORE] [MER-0000] Integration v0.28.2 [CHORE] [MER-3606] Integration v0.28.2 Aug 12, 2024
@eliknebel eliknebel merged commit 2f24f79 into master Aug 15, 2024
5 checks passed
@eliknebel eliknebel deleted the integration-v0.28.2 branch August 15, 2024 15:35
@eliknebel eliknebel restored the integration-v0.28.2 branch August 15, 2024 15:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants