diff --git a/app/views/merge_requests/_notification_banners.html.erb b/app/views/merge_requests/_notification_banners.html.erb index 7674773ab..38c05dbcd 100644 --- a/app/views/merge_requests/_notification_banners.html.erb +++ b/app/views/merge_requests/_notification_banners.html.erb @@ -2,7 +2,7 @@ <%= govuk_notification_banner(title_text: "Important") do %>
+
<% if @merge_request.dpo_user %> Contact the Data Protection Officer: <%= link_to @merge_request.dpo_user.name, user_path(@merge_request.dpo_user.id) %> <% else %> @@ -15,7 +15,7 @@ <%= govuk_notification_banner(title_text: "Important") do %>+
No changes have been made. Try beginning the merge again. <% end %> <% end %> diff --git a/app/views/merge_requests/absorbing_organisation.html.erb b/app/views/merge_requests/absorbing_organisation.html.erb index 40faa88f5..f50bfe943 100644 --- a/app/views/merge_requests/absorbing_organisation.html.erb +++ b/app/views/merge_requests/absorbing_organisation.html.erb @@ -11,7 +11,7 @@If organisations are merging into a new organisation, <%= govuk_link_to "create the new organisation", new_organisation_path %> first and then select it here.
- +