Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 0 deletions

diff --git a/lib/api/internal/base.rb b/lib/api/internal/base.rb
index b53f855c3a2..3edd38a0108 100644
--- a/lib/api/internal/base.rb
+++ b/lib/api/internal/base.rb
@@ -164,6 +164,18 @@ module API
           check_allowed(params)
         end
 
+        post '/error_tracking_allowed', feature_category: :error_tracking do
+          public_key = params[:public_key]
+          project_id = params[:project_id]
+
+          unprocessable_entity! if public_key.blank? || project_id.blank?
+
+          enabled = ::ErrorTracking::ClientKey.enabled_key_for(project_id, public_key).exists?
+
+          status 200
+          { enabled: enabled }
+        end
+
         post "/lfs_authenticate", feature_category: :source_code_management, urgency: :high do
           not_found! unless container&.lfs_enabled?