From b6ecdb750773a0e089760ff8f0cbab2d81d6317d Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Tue, 5 Nov 2019 18:19:52 +0000
Subject: [PATCH] Drop use of record_tag_helper

We only had one place using it and there's no sign of
upstream doing a rails 6 compatible release.
---
 Gemfile                                | 1 -
 Gemfile.lock                           | 3 ---
 app/views/oauth_clients/index.html.erb | 4 ++--
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 45402e5f1..fb5d56f24 100644
--- a/Gemfile
+++ b/Gemfile
@@ -57,7 +57,6 @@ gem "openstreetmap-actionpack-page_caching", ">= 1.1.2", :require => "actionpack
 gem "openstreetmap-deadlock_retry", ">= 1.3.0", :require => "deadlock_retry"
 gem "rack-cors"
 gem "rails-i18n", "~> 4.0.0"
-gem "record_tag_helper"
 gem "rinku", ">= 2.0.6", :require => "rails_rinku"
 gem "strong_migrations"
 gem "validates_email_format_of", ">= 1.5.1"
diff --git a/Gemfile.lock b/Gemfile.lock
index 96aae1d69..7d06ac98d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -362,8 +362,6 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
-    record_tag_helper (1.0.0)
-      actionview (~> 5.x)
     request_store (1.4.1)
       rack (>= 1.4)
     rinku (2.0.6)
@@ -506,7 +504,6 @@ DEPENDENCIES
   rails (= 5.2.3)
   rails-controller-testing
   rails-i18n (~> 4.0.0)
-  record_tag_helper
   rinku (>= 2.0.6)
   rotp
   rubocop
diff --git a/app/views/oauth_clients/index.html.erb b/app/views/oauth_clients/index.html.erb
index 80cae9a6d..41e1e1446 100644
--- a/app/views/oauth_clients/index.html.erb
+++ b/app/views/oauth_clients/index.html.erb
@@ -28,9 +28,9 @@
 <% else %>
 <p><%= t ".registered_apps" %></p>
 <% @client_applications.each do |client| %>
-  <%= div_for client do %>
+  <div class="client_application">
     <%= link_to client.name, :action => :show, :id => client.id %>
-  <% end %>
+  </div>
 <% end %>
 <% end %>
 <h3><%= link_to t(".register_new"), :action => :new %></h3>
-- 
2.43.2