Merge branch 'main' into 937-enable-azure-rbac-deployment-on-all-serv…

…ices

Gemfile.lock

@@ -135,9 +135,9 @@ GEM
     cuprite (0.14.3)
       capybara (~> 3.0)
       ferrum (~> 0.13.0)
-    data_migrate (9.1.1)
-      activerecord (>= 6.0)
-      railties (>= 6.0)
+    data_migrate (9.2.0)
+      activerecord (>= 6.1)
+      railties (>= 6.1)
     date (3.3.4)
     debug (1.8.0)
       irb (>= 1.5.0)
@@ -151,7 +151,7 @@ GEM
     devise_invitable (2.0.8)
       actionmailer (>= 5.0)
       devise (>= 4.6)
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
     dotenv (2.8.1)
     dotenv-rails (2.8.1)
       dotenv (= 2.8.1)
@@ -385,18 +385,18 @@ GEM
     rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-rails (6.0.3)
+    rspec-rails (6.1.1)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
       rspec-core (~> 3.12)
       rspec-expectations (~> 3.12)
       rspec-mocks (~> 3.12)
       rspec-support (~> 3.12)
-    rspec-support (3.12.0)
+    rspec-support (3.12.1)
     rubocop (1.55.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)

app/views/pages/start.html.erb

@@ -53,7 +53,7 @@
             <a class="govuk-link" href="https://www.gov.uk/guidance/teacher-reference-number-trn">Teacher reference number (TRN)</a>
           </li>
           <li class="app-govuk-related-navigation__link">
-            <a class="govuk-link" href="https://www.gov.uk/guidance/teacher-self-service-portal">Teacher self service portal</a>
+            <a class="govuk-link" href="https://access-your-teaching-qualifications.education.gov.uk">Access your teaching qualifications</a>
           </li>
         </ul>
       </nav>

app/views/pages/you_dont_have_a_trn.html.erb

@@ -13,11 +13,13 @@
     <h2 class="govuk-heading-l" id="what-a-trn-is-for">What a TRN is for</h2>
     <p class="govuk-body">You need a TRN to:</p>
     <ul class="govuk-list govuk-list--bullet">
-      <li>view your record with the Teaching Regulation Agency (TRA), and download professional certificates in the <a class="govuk-link" href='https://teacherservices.education.gov.uk/SelfService/Login?_ga=2.206960218.899524735.1637088337-1609244267.1609598427'>Teacher self service portal</a></li>
+      <li><a class="govuk-link" href="https://access-your-teaching-qualifications.education.gov.uk">access your teaching qualifications</a> to download your certificates, change the name on them or check details of your initial teacher training and induction</li>
       <li>give to employers so they can complete mandatory teacher status checks</li>
       <li>manage records of your contributions to the Teachers’ Pensions scheme</li>
       <li>give to the Department for Education (DfE) when you have been awarded QTS so you can begin your early career teacher induction</li>
       <li>register for an NPQ</li>
     </ul>
   </div>
 </div>
+
+<a class="govuk-link" href='https://teacherservices.education.gov.uk/SelfService/Login?_ga=2.206960218.899524735.1637088337-1609244267.1609598427'>Teacher self service portal</a>

db/data_schema.rb

@@ -1 +1 @@
-DataMigrate::Data.define(version: 20_220_831_101_443)
+DataMigrate::Data.define(version: 20220831101443)