Fix merge conflicts in prod for Sep 20, take 2 #427
Merged
Conversation
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
* Add new staging docs site deploy action and workflow * Change to PR branch for testing * Change to PR branch for testing, take 2 * Add quarto render steps to staging and prod workflows * Minor wording fix * Minor wording tweaks * Change to prod site for testing * Fix path issue in aws command, revert to correct branches * Remove some GitHub variables * Switch staging deploy to new AWS access keys * Switch to PR branch for testing * Fix duplicate names * Update bucket region info * Formatting * Update Cloudfront info for staging and debug paths * More path debugging * More path debugging * Fix deploy paths & remove debugging info * Switch back to staging branch * Change to PR branch for testing * Change back to staging branch * Change to PR branch and docs-demo bucket for testing * Change back to prod branch and prod bucket
Merge main into staging
* Filter activity setup * Simplified some inline links * Draft of edited unless-format footnotes * Edited unless-format for Model Activity & Document Overview * Edited unless-format for Submit for approval * Edited unless-format for Assess compliance * Edited unless-format for Work with model findings * Fixed broken links in single-source * Edits based on what is available locally * Final tweaks * Added single-source template * Update README.md * Update README.md * Update site/guide/configuration/manage-your-profile.qmd Co-authored-by: Nik Richers <nik@validmind.ai> * Update site/guide/configuration/manage-your-profile.qmd Co-authored-by: Nik Richers <nik@validmind.ai> * Bolded compliance assessments --------- Co-authored-by: Nik Richers <nik@validmind.ai>
* Draft of new release notes * Edited validation guidelines release * Draft -need to edit bug fixes * Why did it not commit all files?? * Final tweaks to body * Summary added * Grammar?? * Removed extra documentation as requested * Removed bug fixes * My brain is not on today, typo
Merge main into staging
Merge main into staging
* Can we make it only run once let's see * Updated to review_requested
Merge main into staging
* Modify make python-docs to store files in site folder * Add python-docs to source
Merge main into staging
* Remove echoing to log file * Add quarto check to workflow * Add TinyTex install * Experiment by removing tabset * Remove TinyTex install * Re-add tabset, try individual file embeds * Try changing wildcard embed * Try different wildcard embed * Undo workflow changes
Merge main into staging
Merge main into staging
* Delete model findings draft * Tweaks to project > model * Draft for Archive & delete models * Oops carried changes from a working branch instead of main, reverting * Tweaking wording * Indecisive about wording today * Added archive & delete to sidebar * Final tweaks based on what's on staging * Typo * Tired, tweaks * Update site/guide/model-inventory/archive-delete-models.qmd Co-authored-by: Nik Richers <nik@validmind.ai> --------- Co-authored-by: Nik Richers <nik@validmind.ai>
Merge main into staging
* Draft * More fiddling * Fiddling * Link tweaks * More project tweaks * Editing based on demo * Created new Working with model findings landing * 1st pass of broken links * 2nd pass of broken links * Summary drafts * Tweaks * More tweaks * Adjustments for prod * Adding deletion after discussion * Images * Removed commented out indications for required fields * New all model findings image
Merge main into staging
* Inline link & training draft * Edits to footnotes * Example images * Footnotes * Tweaks * Typos * Update site/about/contributing/style-guide/conventions.qmd Co-authored-by: Nik Richers <nik@validmind.ai> * Edited the other front matter ref --------- Co-authored-by: Nik Richers <nik@validmind.ai>
Merge main into staging
* Start adding updated ValidMind colors & logo * Bit more of that lovely green * Prereq tweak --------- Co-authored-by: Beck <164545837+validbeck@users.noreply.github.com>
Merge main into staging
* Update workflows to enable workflow_run * Experiment with workflow_dispatch
Merge main into staging
Merge main into staging
* Move Heap info its own environment folder * Add Quarto profiles * Add profiles for more development builds
Merge main into staging
* Edits to swap docs templates * Added ongoing monitoring to swap templates * Cleaned up guides.qmd * Cleaned up log-in-to-validmind.qmd * Cleaned up set-up-your-organization.qmd * Cleaned up configure-google... .qmd * Cleaned up managing-users .qmd * Cleaned up manage-users.qmd * Cleaned up manage-groups.qmd * Cleaned up manage-roles.qmd * Cleaned up manage-your-profile.qmd * Cleaned up customize-your-dashboard.qmd * Cleaned up working-with-model-workflows.qmd * Cleaned up customize-model-lifecycle-statuses.qmd * Cleaned up set-up-model-workflows.qmd * Cleaned up working-with-model-inventory.qmd * Cleaned up register-models-in-inventory.qmd * Cleaned up customize-model-inventory-layout.qmd * Cleaned up edit-model-inventory-fields.qmd * Cleaned up view-model-activity.qmd * Cleaned up configure-model-interdependencies.qmd * Cleaned up manage-model-inventory-fields.qmd * Tweaks for model stage columns * Cleaned up view-documentation-templates.qmd * Cleaned up customize-documentation-templates.qmd * Cleaned up swap-documentation-templates.qmd * Cleaned up assign-documentation-section-statuses.qmd * Cleaned up submit-for-approval.qmd * Cleaned up export-documentation.qmd * Cleaned up collaborate-with-others.qmd * Project > Model updates * Cleaned up manage-validation-guidelines.qmd * Cleaned up pereparing-validation-reports.qmd * Cleaned up review-model-documentation.qmd * Cleaned up assess-compliance.qmd * Cleaned enable-monitoring.qmd * Cleaned review-monitoring-results.qmd * Final tweaks * Captions added to configuration/ * Captions added to model-workflows/ * Captions added to model-inventory/ * Captions added to model-documentation/ * Captions added to model-validation/ * Captions added to monitoring/ * Update site/guide/configuration/configure-aws-privatelink.qmd Co-authored-by: Nik Richers <nik@validmind.ai> * Update site/guide/model-documentation/collaborate-with-others.qmd Co-authored-by: Nik Richers <nik@validmind.ai> * Quick tweak --------- Co-authored-by: Nik Richers <nik@validmind.ai>
Merge main into staging
* Draft edits * New images * Setup for overview of data * Final revamp, +customizing model findings view * Final tweaks * Update site/guide/model-validation/view-filter-model-findings.qmd Co-authored-by: Nik Richers <nik@validmind.ai> * Adjusted casing for report widgets --------- Co-authored-by: Nik Richers <nik@validmind.ai>
Merge main into staging
* Draft of metric over time blocks info * Draft for toolbar overview * Adjusting images * Edits for toolbar * Quick tweak * Quick single source
* Add docs.validmind.ai/training redirect * Update backgrounds, remove slide numbering, add slide links
* Draft new pages * New files * Draft for independent signup * Last save for the day * Simplifying some stuff * Accept invitation draft * Layout tweaks * Accept invite wip * Register done for now * New registration variable * Applied new variable across site * Final tweaks * Quick tweak * Cropped images * Update site/guide/configuration/register-with-validmind.qmd Co-authored-by: Nik Richers <nik@validmind.ai> * Update site/guide/configuration/register-with-validmind.qmd Co-authored-by: Nik Richers <nik@validmind.ai> * Update site/guide/configuration/register-with-validmind.qmd Co-authored-by: Nik Richers <nik@validmind.ai> * Update site/guide/configuration/register-with-validmind.qmd Co-authored-by: Nik Richers <nik@validmind.ai> * Tweaks --------- Co-authored-by: Nik Richers <nik@validmind.ai>
nrichers
changed the title
|
A PR preview is available: Preview URL |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Internal Notes for Reviewers
This PR merges in
stagingand resolves merge conflicts.External Release Notes