Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-review-branch

# Conflicts:
#	app/models/project_services/prometheus_service.rb
#	app/views/projects/services/_form.html.haml

2 files changed, 34 insertions, 27 deletions

diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index c20581b1333..c7b639b7b3c 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -72,6 +72,8 @@ namespace :admin do
   resource :system_info, controller: 'system_info', only: [:show]
   resources :requests_profiles, only: [:index, :show], param: :name, constraints: { name: /.+\.html/ }
 
+  get 'conversational_development_index' => 'conversational_development_index#show'
+
   resources :projects, only: [:index]
 
   scope(path: 'projects/*namespace_id',
@@ -118,7 +120,7 @@ namespace :admin do
 
   resources :cohorts, only: :index
 
-  resources :builds, only: :index do
+  resources :jobs, only: :index do
     collection do
       post :cancel_all
     end
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 6922f8db795..10ed32a3a33 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -1,4 +1,5 @@
 require 'constraints/project_url_constrainer'
+require 'gitlab/routes/legacy_builds'
 
 resources :projects, only: [:index, :new, :create]
 
@@ -66,7 +67,7 @@ constraints(ProjectUrlConstrainer.new) do
 
       resources :services, constraints: { id: /[^\/]+/ }, only: [:index, :edit, :update] do
         member do
-          get :test
+          put :test
         end
       end
 
@@ -186,38 +187,42 @@ constraints(ProjectUrlConstrainer.new) do
         end
       end
 
-      resources :builds, only: [:index, :show], constraints: { id: /\d+/ } do
-        collection do
-          post :cancel_all
-
-          resources :artifacts, only: [] do
-            collection do
-              get :latest_succeeded,
-                path: '*ref_name_and_path',
-                format: false
+      scope '-' do
+        resources :jobs, only: [:index, :show], constraints: { id: /\d+/ } do
+          collection do
+            post :cancel_all
+
+            resources :artifacts, only: [] do
+              collection do
+                get :latest_succeeded,
+                  path: '*ref_name_and_path',
+                  format: false
+              end
             end
           end
-        end
 
-        member do
-          get :status
-          post :cancel
-          post :retry
-          post :play
-          post :erase
-          get :trace, defaults: { format: 'json' }
-          get :raw
-        end
+          member do
+            get :status
+            post :cancel
+            post :retry
+            post :play
+            post :erase
+            get :trace, defaults: { format: 'json' }
+            get :raw
+          end
 
-        resource :artifacts, only: [] do
-          get :download
-          get :browse, path: 'browse(/*path)', format: false
-          get :file, path: 'file/*path', format: false
-          get :raw, path: 'raw/*path', format: false
-          post :keep
+          resource :artifacts, only: [] do
+            get :download
+            get :browse, path: 'browse(/*path)', format: false
+            get :file, path: 'file/*path', format: false
+            get :raw, path: 'raw/*path', format: false
+            post :keep
+          end
         end
       end
 
+      Gitlab::Routes::LegacyBuilds.new(self).draw
+
       resources :hooks, only: [:index, :create, :edit, :update, :destroy], constraints: { id: /\d+/ } do
         member do
           get :test