Add latest changes from gitlab-org/gitlab@master

2 files changed, 8 insertions, 1 deletions

diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index ce9df6b6024..760688d8088 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -1227,7 +1227,7 @@ test:
     client_path: tmp/tests/gitaly
     token: secret
   workhorse:
-    secret_file: tmp/tests/gitlab_workhorse_secret
+    secret_file: tmp/gitlab_workhorse_test_secret
   backup:
     path: tmp/tests/backups
   pseudonymizer:
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 809c1386f2c..83575580321 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -175,6 +175,13 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           end
         end
 
+        resources :logs, only: [:index] do
+          collection do
+            get :k8s
+            get :elasticsearch
+          end
+        end
+
         resources :starrers, only: [:index]
         resources :forks, only: [:index, :new, :create]
         resources :group_links, only: [:index, :create, :update, :destroy], constraints: { id: /\d+/ }