Merge pull request #537 from uktrade/release

PROD Release
uktrade · May 26, 2021 · f1e2e32 · f1e2e32
2 parents 93d3c4b + 7b46692
commit f1e2e32
Show file tree

Hide file tree

Showing 8 changed files with 640 additions and 409 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,9 +2,11 @@
 
 ## Pre release
 ### Enhancements
+- GP2-2380 - Bump directory-components
 - GP2-2327 - Expose social login attribute
 - GP2-2225 - forgotten password notification social accounts
 - NOTICKET - Remove social provider in settings confusing as it's stored in django admin
+- GP2-2554 - error-page-update-links
 ### Fixed bugs
 
 

diff --git a/requirements.in b/requirements.in
@@ -20,7 +20,7 @@ sigauth==4.1.1
 directory-api-client==22.5.0
 directory-validators==6.0.5
 directory-healthcheck==2.0.0
-directory-components==36.2.0
+directory-components==37.2.0
 requests[security]==2.25.1
 urllib3>=1.24.2<2.0.0
 django-cryptography==1.0

diff --git a/requirements.txt b/requirements.txt
@@ -40,7 +40,7 @@ directory-api-client==22.5.0
     # via -r requirements.in
 directory-client-core==6.3.0
     # via directory-api-client
-directory-components==36.2.0
+directory-components==37.2.0
     # via -r requirements.in
 directory-constants==20.28.0
     # via directory-components

diff --git a/requirements_test.txt b/requirements_test.txt
@@ -60,7 +60,7 @@ directory-api-client==22.5.0
     # via -r requirements.in
 directory-client-core==6.3.0
     # via directory-api-client
-directory-components==36.2.0
+directory-components==37.2.0
     # via -r requirements.in
 directory-constants==20.28.0
     # via directory-components

diff --git a/sso/templates/400.html b/sso/templates/400.html
@@ -4,7 +4,7 @@
     <h1 class="sso-error-page-title heading-xlarge">Something went wrong</h1>
     <ul class="list list-bullet sso-error-page-synopsis">
         <li>If this problem persists, please <a class="link" href="{{ services_urls.feedback }}" title="report a broken link">report the problem</a>.</li>
-        <li>Return to the <a class="link" href="{% url 'account_login' %}" title="return login">login page</a>.</li>
+        <li>Return to the <a class="link" href="/" title="return login">home page</a>.</li>
     </ul>
     <hr>
     <p class="sso-error-page-status">HTTP 400 Error Code - Bad Request</p>

diff --git a/sso/templates/403.html b/sso/templates/403.html
@@ -4,7 +4,7 @@
     <h1 class="heading-xlarge sso-error-page-title">You do not have permission to view this page</h1>
     <ul class="list list-bullet sso-error-page-synopsis">
         <li>If this problem persists, please <a class="link" href="{{ services_urls.feedback }}" title="report a broken link">report the problem</a>.</li>
-        <li>Return to the <a class="link" href="{% url 'account_login' %}" title="return login">login page</a>.</li>
+        <li>Return to the <a class="link" href="/" title="return login">home page</a>.</li>
     </ul>
     <hr>
     <p class="sso-error-page-status">HTTP 403 Error Code - Forbidden</p>

diff --git a/sso/templates/500.html b/sso/templates/500.html
@@ -4,7 +4,7 @@
     <h1 class="heading-xlarge sso-error-page-title">An unexpected error occurred</h1>
     <ul class="list list-bullet sso-error-page-synopsis">
         <li>If this problem persists, please <a class="link" href="{{ services_urls.feedback }}" title="report a broken link">report the problem</a>.</li>
-        <li>Return to the <a class="link" href="{% url 'account_login' %}" title="return login">login page</a>.</li>
+        <li>Return to the <a class="link" href="/" title="return login">home page</a>.</li>
     </ul>
     <hr>
     <p class="sso-error-page-status">HTTP 500 Error Code - Internal Server Error</p>