Merge pull request #3794 from uktrade/develop

Release PR
uktrade · Jan 20, 2025 · 1948f0e · 1948f0e
2 parents 807d94a + f0ca64a
commit 1948f0e
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 17 deletions.
diff --git a/config/settings.py b/config/settings.py
@@ -203,7 +203,7 @@
 # Database
 # https://docs.djangoproject.com/en/2.2/ref/settings/#databases
 
-if is_copilot():
+if is_copilot() and not env.is_docker:
     DATABASES = database_from_env('DATABASE_CREDENTIALS')
     DATABASES['default']['ENGINE'] = 'django.db.backends.postgresql'
 

diff --git a/core/static/images/great_homepage_hero_energy_lines.png b/core/static/images/great_homepage_hero_energy_lines.png
diff --git a/react-components/dist/components_styles.css b/react-components/dist/components_styles.css
diff --git a/react-components/dist/components_styles.css.map b/react-components/dist/components_styles.css.map
diff --git a/react-components/dist/international_styles.css b/react-components/dist/international_styles.css
diff --git a/react-components/dist/international_styles.css.map b/react-components/dist/international_styles.css.map
diff --git a/react-components/dist/learn_styles.css b/react-components/dist/learn_styles.css
diff --git a/react-components/dist/learn_styles.css.map b/react-components/dist/learn_styles.css.map
diff --git a/react-components/dist/loggedout_styles.css b/react-components/dist/loggedout_styles.css
diff --git a/react-components/dist/loggedout_styles.css.map b/react-components/dist/loggedout_styles.css.map
diff --git a/react-components/dist/magna_styles.css b/react-components/dist/magna_styles.css
diff --git a/react-components/dist/magna_styles.css.map b/react-components/dist/magna_styles.css.map
diff --git a/react-components/dist/microsite_styles.css b/react-components/dist/microsite_styles.css
diff --git a/react-components/dist/microsite_styles.css.map b/react-components/dist/microsite_styles.css.map
diff --git a/sso_profile/templates/exops/is-exops-user-applications.html b/sso_profile/templates/exops/is-exops-user-applications.html
@@ -25,7 +25,7 @@ <h1 class="sso-profile-eig-title heading-xlarge">Applications</h1>
                             <a class="link" href="{{ enquiry.opportunity_url }}">{{ enquiry.title }}</a>
                         </div>
                         <div class="sso-profile-eig-opportunity-item-description">
-                            <span>{{ enquiry.description|linebreaks }}</span>
+                            <span>{{ enquiry.description|safe|linebreaks }}</span>
                         </div>
                         <div class="sso-profile-eig-opportunity-item-expires">
                             <strong>Opportunity expires:</strong><span>{{ enquiry.expiration_date|parse_date:"%Y-%m-%d"|date:"d F Y" }}</span>

diff --git a/styles/great/_components.scss b/styles/great/_components.scss
@@ -1822,7 +1822,7 @@ nav.great-breadcrumbs {
 
   @include govuk-media-query($from: desktop) {
     background-color: $great-dark-blue;
-    background-image: url(/static/images/water-lilies.png);
+    background-image: url(/static/images/great_homepage_hero_energy_lines.png);
   }
 
   .great-hero__heading {