Add latest changes from gitlab-org/gitlab@master

3 files changed, 16 insertions, 4 deletions

diff --git a/config/application.rb b/config/application.rb
index 8a40aaa8bd6..1dd6fc04b16 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -99,7 +99,6 @@ module Gitlab
                                      #{config.root}/app/models/badges
                                      #{config.root}/app/models/hooks
                                      #{config.root}/app/models/members
-                                     #{config.root}/app/models/project_services
                                      #{config.root}/app/graphql/resolvers/concerns
                                      #{config.root}/app/graphql/mutations/concerns
                                      #{config.root}/app/graphql/types/concerns])
diff --git a/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml b/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml
index 0b68f3d5698..312bbc1dff6 100644
--- a/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml
+++ b/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml
@@ -1,6 +1,7 @@
 ---
 data_category: optional
 key_path: counts.jira_imports_total_imported_issues_count
+instrumentation_class: JiraImportsTotalImportedIssuesCountMetric
 description: Count of total issues imported via the Jira Importer
 product_section: dev
 product_stage: ecosystem
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 6b2a9700686..c7f0c726371 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -130,7 +130,17 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
             end
           end
 
-          resource :integrations, only: [:show]
+          resources :integrations, constraints: { id: %r{[^/]+} }, only: [:index, :edit, :update] do
+            member do
+              put :test
+            end
+
+            resources :hook_logs, only: [:show], controller: :integration_hook_logs do
+              member do
+                post :retry
+              end
+            end
+          end
 
           resource :repository, only: [:show], controller: :repository do
             # TODO: Removed this "create_deploy_token" route after change was made in app/helpers/ci_variables_helper.rb:14
@@ -209,12 +219,14 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           end
         end
 
-        resources :integrations, controller: :services, constraints: { id: %r{[^/]+} }, only: [:edit, :update] do
+        # Legacy routes for `/-/integrations` which are now in `/-/settings/integrations`.
+        # Can be removed in 15.2, see https://gitlab.com/gitlab-org/gitlab/-/issues/334846
+        resources :integrations, controller: 'settings/integrations', constraints: { id: %r{[^/]+} }, only: [:edit, :update] do
           member do
             put :test
           end
 
-          resources :hook_logs, only: [:show], controller: :service_hook_logs do
+          resources :hook_logs, only: [:show], controller: 'settings/integration_hook_logs' do
             member do
               post :retry
             end