Skip to content

Commit

Permalink
release: merge latest dev changes into main (#60)
Browse files Browse the repository at this point in the history
* feat: DBT Specific content changes need to be configurable

* ensuring SESSION_COOKIE_SAMESITE doesnt exist in dbt envs

* accidentally reverted REPO_OWNER var

* Added G4 analytics to base.html

* feat: add branch strategy and pr instructions to readme.md (#34)

* fix: revert all streamlit docker integration (#52)

* fix: update notebooks poetry.lock file (#54)

* Bump certifi from 2024.6.2 to 2024.7.4 in /django_app (#56)

Bumps [certifi](https://github.com/certifi/python-certifi) from 2024.6.2 to 2024.7.4.
- [Commits](certifi/python-certifi@2024.06.02...2024.07.04)

---
updated-dependencies:
- dependency-name: certifi
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump streamlit from 1.36.0 to 1.37.0 (#46)

Bumps [streamlit](https://github.com/streamlit/streamlit) from 1.36.0 to 1.37.0.
- [Release notes](https://github.com/streamlit/streamlit/releases)
- [Commits](streamlit/streamlit@1.36.0...1.37.0)

---
updated-dependencies:
- dependency-name: streamlit
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tash Boyse <natasha.boyse@digital.trade.gov.uk>

* Feat: DBT specific content changes (#33)

* feat: DBT Specific content changes need to be configurable

* ensuring SESSION_COOKIE_SAMESITE doesnt exist in dbt envs

* accidentally reverted REPO_OWNER var

* fix: dev incorrect commits (#59)

* refactor chunk and embed process for 0.4

* refactor chunk-embed for 0.4; update pass rates and plots

* revert to default values; update plot and table outputs

* move redundant imports

* release: Merge latest dev into main (#57)

* feat: add branch strategy and pr instructions to readme.md (#34)

* fix: revert all streamlit docker integration (#52)

* fix: update notebooks poetry.lock file (#54)

* Bump certifi from 2024.6.2 to 2024.7.4 in /django_app (#56)

Bumps [certifi](https://github.com/certifi/python-certifi) from 2024.6.2 to 2024.7.4.
- [Commits](certifi/python-certifi@2024.06.02...2024.07.04)

---
updated-dependencies:
- dependency-name: certifi
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump streamlit from 1.36.0 to 1.37.0 (#46)

Bumps [streamlit](https://github.com/streamlit/streamlit) from 1.36.0 to 1.37.0.
- [Release notes](https://github.com/streamlit/streamlit/releases)
- [Commits](streamlit/streamlit@1.36.0...1.37.0)

---
updated-dependencies:
- dependency-name: streamlit
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tash Boyse <natasha.boyse@digital.trade.gov.uk>

* Feat: DBT specific content changes (#33)

* feat: DBT Specific content changes need to be configurable

* ensuring SESSION_COOKIE_SAMESITE doesnt exist in dbt envs

* accidentally reverted REPO_OWNER var

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: A Gleeson <anthoni.gleeson@digital.trade.gov.uk>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* update comments

* Added G4 analytics to base.html

* Bump certifi from 2024.6.2 to 2024.7.4 in /django_app (#56)

Bumps [certifi](https://github.com/certifi/python-certifi) from 2024.6.2 to 2024.7.4.
- [Commits](certifi/python-certifi@2024.06.02...2024.07.04)

---
updated-dependencies:
- dependency-name: certifi
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: esoutter <euan.soutter@businessandtrade.gov.uk>
Co-authored-by: A Gleeson <anthoni.gleeson@digital.trade.gov.uk>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Euan Soutter <168103747+esoutter@users.noreply.github.com>
Co-authored-by: Simon Strong <simonstrong@DBT000698.local>

* fix: accidental removal of comment block close

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Simon Strong <simonstrong@DBT000698.local>
Co-authored-by: A Gleeson <anthoni.gleeson@digital.trade.gov.uk>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: simonstrong-dbt <168641861+simonstrong-dbt@users.noreply.github.com>
Co-authored-by: esoutter <euan.soutter@businessandtrade.gov.uk>
Co-authored-by: Euan Soutter <168103747+esoutter@users.noreply.github.com>
  • Loading branch information
7 people authored Aug 20, 2024
1 parent d48fa87 commit 3c82166
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions django_app/redbox_app/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,19 @@
data-domain="redbox.ai.cabinetoffice.gov.uk" src="https://plausible.io/js/script.pageview-props.tagged-events.outbound-links.file-downloads.js"></script>
{% endif %}

{% if environment | lower == "prod" and repo_owner | lower == "uktrade" %}
<!-- Google tag (gtag.js) -->
<script async src="{{ analytics_link }}"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());

gtag('config', '{{ analytics_tag }}');
</script>

{% endif %}

{# Temporarily removed due to this adding inline styles, which our CSP doesn't allow
{% if environment | lower == "preprod" %}
<script type="module" src="{{ static('js/posthog.js') }}"></script>
Expand Down

0 comments on commit 3c82166

Please sign in to comment.