Add latest changes from gitlab-org/gitlab@master

app/controllers/admin/application_settings_controller.rb

@@ -31,7 +31,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
 
   feature_category :source_code_management, [:repository, :clear_repository_check_states]
   feature_category :continuous_integration, [:ci_cd, :reset_registration_token]
-  feature_category :collection, [:usage_data]
+  feature_category :usage_ping, [:usage_data]
   feature_category :integrations, [:integrations]
   feature_category :pages, [:lets_encrypt_terms_of_service]
 

app/controllers/projects/usage_ping_controller.rb

@@ -3,7 +3,7 @@
 class Projects::UsagePingController < Projects::ApplicationController
   before_action :authenticate_user!
 
-  feature_category :collection
+  feature_category :usage_ping
 
   def web_ide_clientside_preview
     return render_404 unless Gitlab::CurrentSettings.web_ide_clientside_preview_enabled?

app/views/notify/issue_due_email.html.haml

@@ -1,5 +1,5 @@
 %p.details
-  #{link_to @issue.author_name, user_url(@issue.author)}'s issue is due soon.
+  #{link_to @issue.author_name, user_url(@issue.author)}'s issue #{issue_reference_link(@issue)} is due soon.
 
 - if @issue.assignees.any?
   %p

app/views/notify/issue_due_email.text.erb

@@ -1,6 +1,6 @@
 The following issue is due on <%= @issue.due_date %>:
 
-Issue <%= @issue.iid %>: <%= url_for(project_issue_url(@issue.project, @issue)) %>
+Issue <%= @issue.iid %>: <%= issue_reference_link(@issue) %>
 Author:    <%= @issue.author_name %>
 <%= assignees_label(@issue) %>
 

app/workers/all_queues.yml

@@ -188,7 +188,7 @@
   :idempotent:
   :tags: []
 - :name: cronjob:gitlab_usage_ping
-  :feature_category: :collection
+  :feature_category: :usage_ping
   :has_external_dependencies:
   :urgency: :low
   :resource_boundary: :unknown

app/workers/gitlab_usage_ping_worker.rb

@@ -8,7 +8,7 @@ class GitlabUsagePingWorker # rubocop:disable Scalability/IdempotentWorker
   include CronjobQueue # rubocop:disable Scalability/CronWorkerContext
   include Gitlab::ExclusiveLeaseHelpers
 
-  feature_category :collection
+  feature_category :usage_ping
   sidekiq_options retry: 3, dead: false
   sidekiq_retry_in { |count| (count + 1) * 8.hours.to_i }
 

changelogs/unreleased/cablett-issue-due.yml

@@ -0,0 +1,5 @@
+---
+title: Add issue link to due date emails
+merge_request: 50642
+author:
+type: changed

config/feature_categories.yml

@@ -9,7 +9,6 @@
 ---
 - accessibility_testing
 - advanced_deployments
-- analysis
 - api
 - attack_emulation
 - audit_events
@@ -25,7 +24,6 @@
 - code_quality
 - code_review
 - code_testing
-- collection
 - compliance_management
 - container_host_security
 - container_network_security
@@ -83,6 +81,7 @@
 - pages
 - pipeline_authoring
 - planning_analytics
+- privacy_control_center
 - product_analytics
 - projects
 - provision
@@ -112,6 +111,7 @@
 - time_tracking
 - tracing
 - usability_testing
+- usage_ping
 - users
 - value_stream_management
 - vulnerability_database

lib/api/usage_data.rb

@@ -4,7 +4,7 @@ module API
   class UsageData < ::API::Base
     before { authenticate! }
 
-    feature_category :collection
+    feature_category :usage_ping
 
     namespace 'usage_data' do
       before do

spec/mailers/notify_spec.rb

@@ -224,6 +224,10 @@ RSpec.describe Notify do
           let(:model) { issue }
         end
 
+        it 'contains a link to the issue' do
+          is_expected.to have_body_text(issue.to_reference(full: false))
+        end
+
         it_behaves_like 'it should show Gmail Actions View Issue link'
         it_behaves_like 'an unsubscribeable thread'
         it_behaves_like 'appearance header and footer enabled'