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.

diff --git a/Gemfile b/Gemfile
index 45402e5f1c4fa12fdc040e64ce0e84621b601037..fb5d56f24654fc19872111237aa0cbb57beda6cc 100644 (file)
--- 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 "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"
 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 96aae1d6910bd49b9e35c0bb0aa84d8ef4893935..7d06ac98d0c101eabdae00d5f0ecd897a7d22995 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -362,8 +362,6 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
     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)
     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)
   rails (= 5.2.3)
   rails-controller-testing
   rails-i18n (~> 4.0.0)

-  record_tag_helper

   rinku (>= 2.0.6)
   rotp
   rubocop
   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 80cae9a6d3439135d9701ec4c2dd3d245e53eff3..41e1e144660cf59f063ace779677c987b79d5456 100644 (file)
--- 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| %>
 <% 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 %>
     <%= link_to client.name, :action => :show, :id => client.id %>

-  <% end %>
+  </div>

 <% end %>
 <% end %>
 <h3><%= link_to t(".register_new"), :action => :new %></h3>
 <% end %>
 <% end %>
 <h3><%= link_to t(".register_new"), :action => :new %></h3>