Add latest changes from gitlab-org/gitlab@master

1 files changed, 19 insertions, 0 deletions

diff --git a/app/controllers/well_known_controller.rb b/app/controllers/well_known_controller.rb
new file mode 100644
index 00000000000..9ca38a81b11
--- /dev/null
+++ b/app/controllers/well_known_controller.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+# This controller implements /.well-known paths that have no better home.
+#
+# Other controllers also implement /.well-known/* paths. They can be
+# discovered by running `rails routes | grep "well-known"`.
+class WellKnownController < ApplicationController # rubocop:disable Gitlab/NamespacedClass -- No relevant product domain exists
+  skip_before_action :authenticate_user!, :check_two_factor_requirement
+  feature_category :compliance_management, [:security_txt]
+
+  def security_txt
+    content = Gitlab::CurrentSettings.current_application_settings.security_txt_content
+    if content.present?
+      render plain: content
+    else
+      route_not_found
+    end
+  end
+end