Reconcile with core

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - { ruby: '3.2', postgres: 13.5 }
+        - { ruby: '3.4', postgres: 13.5 }
 
     services:
       postgres:

.github/workflows/rubocop.yml

@@ -26,7 +26,7 @@ jobs:
     - name: Install Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.0
+        ruby-version: 3.4
         bundler-cache: true
 
     - name: Run RuboCop linter

lib/views/followups/_followup.html.erb

@@ -73,9 +73,6 @@
                 'to reply, they should normally have responded by ' \
                 '<strong>{{date}}</strong>',
                 date: simple_date(@info_request.date_response_required_by)) %>
-
-          (<%= link_to _('details'),
-                       help_requesting_path(anchor: 'authorities') %>).
         <% elsif @info_request.public_body.is_school? %>
           <%= _('The response to your request has been <strong>delayed</strong>. ' \
                 'You can say that, by law, the authority should normally have ' \
@@ -88,28 +85,23 @@
                 'normally have responded <strong>promptly</strong> and by ' \
                 '<strong>{{date}}</strong>',
                 date: simple_date(@info_request.date_response_required_by)) %>
+        <% end %>
 
-          (<%= link_to _('details'),
-                       help_requesting_path(anchor: 'quickly_response') %>).
-       <% end %>
+        (<%= details_help_link(@info_request.public_body) %>).
       </p>
     <% elsif status == 'waiting_response_very_overdue' %>
       <p>
         <% if @info_request.public_body.not_subject_to_law? %>
           <%= _('The response to your request is <strong>long overdue' \
                 '</strong>. Although the authority has no legal obligation ' \
                 'to reply, they should have responded by now') %>
-
-          (<%= link_to _('details'),
-                       help_requesting_path(anchor: 'authorities') %>).
         <% else %>
           <%= _('The response to your request is <strong>long overdue' \
                 '</strong>. You can say that, by law, under all ' \
                 'circumstances, the authority should have responded by now') %>
-
-          (<%= link_to _('details'),
-                       help_requesting_path(anchor: 'quickly_response') %>).
         <% end %>
+
+        (<%= details_help_link(@info_request.public_body) %>).
       </p>
     <% end %>
 
@@ -127,13 +119,24 @@
       </div>
     <% end %>
 
+    <% if @info_request.from_name != @info_request.user_name %>
+      <div class="warning">
+        <%= _('Your name has been changed since your last message in this ' \
+              'request. Please consider mentioning this to the authority ' \
+              'and explain that you are the original requester.') %>
+      </div>
+    <% end %>
+
     <% form_url =
          if incoming_message.nil?
-           preview_request_followups_url(request_id: @info_request.id)
+           preview_request_followups_url(
+             request_url_title: @info_request.url_title
+           )
          else
            preview_request_followups_url(
-             request_id: @info_request.id,
-             incoming_message_id: incoming_message.id)
+             request_url_title: @info_request.url_title,
+             incoming_message_id: incoming_message.id
+           )
          end -%>
     <%= form_for @outgoing_message,
                  html: { id: 'followup_form' },

lib/views/general/_nav_items.html.erb

@@ -10,7 +10,7 @@
   <%= link_to _("View authorities"), list_public_bodies_default_path %>
 </li>
 
-<% unless AlaveteliConfiguration::blog_feed.empty? %>
+<% if Blog.enabled? %>
   <li class="<%= 'selected' if controller?('general') && action?('blog') %>"><%= link_to _("Read blog"), blog_path %></li>
 <% end %>
 

lib/views/request_mailer/overdue_alert.text.erb

@@ -1,6 +1,6 @@
 <%= raw @info_request.public_body.name %> <%= _('have delayed.') %>
 
-<%= _('They have not replied to your {{law_used_short}} request {{title}} ' \
+<%= _("They have not replied to your {{law_used_short}} request '{{title}}' " \
       'promptly, as normally required by law',
       law_used_short: @info_request.legislation.to_s.html_safe,
       title: @info_request.title.html_safe) %><% if @info_request.public_body.is_school? %> <%=_('during term time')%> <% end %>.

lib/views/request_mailer/very_overdue_alert.text.erb

@@ -1,6 +1,6 @@
 <%= raw @info_request.public_body.name %> <%= _('are long overdue.')%>
 
-<%= _('They have not replied to your {{law_used_short}} request {{title}}, ' \
+<%= _("They have not replied to your {{law_used_short}} request '{{title}}', " \
       'as normally required by law',
       law_used_short: @info_request.legislation.to_s.html_safe,
       title: @info_request.title.html_safe) %><% if @info_request.public_body.is_school? %> <%= _('even during holidays') %><% end %>.