Merge remote-tracking branch 'parent/main' into upstream-20240926

app/views/admin/reports/_status.html.haml

@@ -18,7 +18,7 @@
       - if status.application
         = status.application.name
         ·
-      = link_to ActivityPub::TagManager.instance.url_for(status), class: 'detailed-status__datetime', target: stream_link_target, rel: 'noopener noreferrer' do
+      = link_to ActivityPub::TagManager.instance.url_for(status.proper), class: 'detailed-status__datetime', target: stream_link_target, rel: 'noopener noreferrer' do
         %time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
       - if status.edited?
         ·

app/views/admin/trends/links/preview_card_providers/index.html.haml

@@ -12,7 +12,7 @@
       %li= filter_link_to t('generic.all'), status: nil
       %li= filter_link_to t('admin.trends.approved'), status: 'approved'
       %li= filter_link_to t('admin.trends.rejected'), status: 'rejected'
-      %li= filter_link_to safe_join([t('admin.accounts.moderation.pending'), "(#{PreviewCardProvider.pending_review.count})"], ' '), status: 'pending_review'
+      %li= filter_link_to safe_join([t('admin.accounts.moderation.pending'), "(#{PreviewCardProvider.unreviewed.count})"], ' '), status: 'pending_review'
   .back-link
     = link_to admin_trends_links_path do
       = material_symbol 'chevron_left'

app/views/settings/applications/_fields.html.haml

@@ -1,36 +0,0 @@
-.fields-group
-  = f.input :name,
-            label: t('activerecord.attributes.doorkeeper/application.name'),
-            wrapper: :with_label
-
-.fields-group
-  = f.input :website,
-            label: t('activerecord.attributes.doorkeeper/application.website'),
-            wrapper: :with_label
-
-.fields-group
-  = f.input :redirect_uri,
-            label: t('activerecord.attributes.doorkeeper/application.redirect_uri'), hint: t('doorkeeper.applications.help.redirect_uri'),
-            required: true,
-            wrapper: :with_block_label
-
-  %p.hint= t('doorkeeper.applications.help.native_redirect_uri', native_redirect_uri: content_tag(:code, Doorkeeper.configuration.native_redirect_uri)).html_safe
-
-.field-group
-  .input.with_block_label
-    %label= t('activerecord.attributes.doorkeeper/application.scopes')
-    %span.hint= t('simple_form.hints.defaults.scopes')
-
-  - Doorkeeper.configuration.scopes.group_by { |s| s.split(':').first }.each_value do |value|
-    = f.input :scopes,
-              as: :check_boxes,
-              collection_wrapper_tag: 'ul',
-              collection: value.sort,
-              hint: false,
-              include_blank: false,
-              item_wrapper_tag: 'li',
-              label_method: ->(scope) { safe_join([content_tag(:samp, scope, class: class_for_scope(scope)), content_tag(:span, t("doorkeeper.scopes.#{scope}"), class: 'hint')]) },
-              label: false,
-              required: false,
-              selected: f.object.scopes.all,
-              wrapper: :with_block_label

app/views/settings/applications/_form.html.haml

@@ -0,0 +1,36 @@
+.fields-group
+  = form.input :name,
+               label: t('activerecord.attributes.doorkeeper/application.name'),
+               wrapper: :with_label
+
+.fields-group
+  = form.input :website,
+               label: t('activerecord.attributes.doorkeeper/application.website'),
+               wrapper: :with_label
+
+.fields-group
+  = form.input :redirect_uri,
+               label: t('activerecord.attributes.doorkeeper/application.redirect_uri'), hint: t('doorkeeper.applications.help.redirect_uri'),
+               required: true,
+               wrapper: :with_block_label
+
+  %p.hint= t('doorkeeper.applications.help.native_redirect_uri', native_redirect_uri: content_tag(:code, Doorkeeper.configuration.native_redirect_uri)).html_safe
+
+.field-group
+  .input.with_block_label
+    %label= t('activerecord.attributes.doorkeeper/application.scopes')
+    %span.hint= t('simple_form.hints.defaults.scopes')
+
+  - Doorkeeper.configuration.scopes.group_by { |s| s.split(':').first }.each_value do |value|
+    = form.input :scopes,
+                 as: :check_boxes,
+                 collection_wrapper_tag: 'ul',
+                 collection: value.sort,
+                 hint: false,
+                 include_blank: false,
+                 item_wrapper_tag: 'li',
+                 label_method: ->(scope) { safe_join([content_tag(:samp, scope, class: class_for_scope(scope)), content_tag(:span, t("doorkeeper.scopes.#{scope}"), class: 'hint')]) },
+                 label: false,
+                 required: false,
+                 selected: form.object.scopes.all,
+                 wrapper: :with_block_label

app/views/settings/applications/new.html.haml

@@ -1,8 +1,8 @@
 - content_for :page_title do
   = t('doorkeeper.applications.new.title')
 
-= simple_form_for @application, url: settings_applications_path do |f|
-  = render 'fields', f: f
+= simple_form_for @application, url: settings_applications_path do |form|
+  = render form
 
   .actions
-    = f.button :button, t('doorkeeper.applications.buttons.submit'), type: :submit
+    = form.button :button, t('doorkeeper.applications.buttons.submit'), type: :submit

app/views/settings/applications/show.html.haml

@@ -23,8 +23,8 @@
 
 %hr/
 
-= simple_form_for @application, url: settings_application_path(@application), method: :put do |f|
-  = render 'fields', f: f
+= simple_form_for @application, url: settings_application_path(@application), method: :put do |form|
+  = render form
 
   .actions
-    = f.button :button, t('generic.save_changes'), type: :submit
+    = form.button :button, t('generic.save_changes'), type: :submit