Skip to content

Commit

Permalink
Merge branch 'main' into tasks/WP-190-Tapis-Mutex
Browse files Browse the repository at this point in the history
  • Loading branch information
rstijerina authored Feb 9, 2024
2 parents b5fc7e1 + 041440e commit 495c04b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
7 changes: 4 additions & 3 deletions server/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion server/portal/templates/includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

{% include "includes/nav_cms.html" with className="navbar-nav" only %}

{# NOTE: As of 2020-12, search is only available with a Portal #}
{% include "includes/nav_search.html" with className="form-inline ml-auto" only %}
{# FAQ: Unlike CMS and User Guide, we must pass `user` #}
{% include "includes/nav_portal.html" with className="navbar-nav" user=user settings=settings only %}
Expand Down

0 comments on commit 495c04b

Please sign in to comment.