Add latest changes from gitlab-org/gitlab@master

app/controllers/import/github_controller.rb

@@ -29,7 +29,7 @@ class Import::GithubController < Import::BaseController
   def status
     # Request repos to display error page if provider token is invalid
-    # Improving in https://gitlab.com/gitlab-org/gitlab-ce/issues/55585
+    # Improving in https://gitlab.com/gitlab-org/gitlab-foss/issues/55585
     client_repos
     respond_to do |format|

app/controllers/import/gitlab_projects_controller.rb

@@ -49,6 +49,6 @@ class Import::GitlabProjectsController < Import::BaseController
   end
   def whitelist_query_limiting
-    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42437')
+    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-foss/issues/42437')
   end
 end

app/controllers/import/manifest_controller.rb

@@ -96,6 +96,6 @@ class Import::ManifestController < Import::BaseController
   end
   def whitelist_query_limiting
-    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/48939')
+    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-foss/issues/48939')
   end
 end

app/controllers/projects/blob_controller.rb

@@ -95,7 +95,7 @@ class Projects::BlobController < Projects::ApplicationController
     @form = Blobs::UnfoldPresenter.new(blob, diff_params)
     # keep only json rendering when
-    # https://gitlab.com/gitlab-org/gitlab-ce/issues/44988 is done
+    # https://gitlab.com/gitlab-org/gitlab-foss/issues/44988 is done
     if rendered_for_merge_request?
       render json: DiffLineSerializer.new.represent(@form.diff_lines)
     else

app/controllers/projects/branches_controller.rb

@@ -25,7 +25,7 @@ class Projects::BranchesController < Projects::ApplicationController
         @refs_pipelines = @project.ci_pipelines.latest_successful_for_refs(@branches.map(&:name))
         @merged_branch_names = repository.merged_branch_names(@branches.map(&:name))
-        # https://gitlab.com/gitlab-org/gitlab-ce/issues/48097
+        # https://gitlab.com/gitlab-org/gitlab-foss/issues/48097
         Gitlab::GitalyClient.allow_n_plus_1_calls do
           render
         end

app/controllers/projects/clusters_controller.rb

@@ -24,3 +24,5 @@ class Projects::ClustersController < Clusters::ClustersController
     @repository ||= project.repository
   end
 end
+
+Projects::ClustersController.prepend_if_ee('EE::Projects::ClustersController')

app/controllers/projects/commits_controller.rb

@@ -77,6 +77,6 @@ class Projects::CommitsController < Projects::ApplicationController
   end
   def whitelist_query_limiting
-    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42330')
+    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-foss/issues/42330')
   end
 end

app/controllers/projects/cycle_analytics_controller.rb

@@ -42,6 +42,6 @@ class Projects::CycleAnalyticsController < Projects::ApplicationController
   end
   def whitelist_query_limiting
-    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42671')
+    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-foss/issues/42671')
   end
 end

app/controllers/projects/environments_controller.rb

@@ -164,7 +164,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController
       result = dashboard_finder.find(
         project,
         current_user,
-        environment,
+        environment: environment,
         dashboard_path: params[:dashboard],
         **dashboard_params.to_h.symbolize_keys
       )
@@ -172,13 +172,13 @@ class Projects::EnvironmentsController < Projects::ApplicationController
       result = dashboard_finder.find(
         project,
         current_user,
-        environment,
+        environment: environment,
         dashboard_path: params[:dashboard]
       )
       result[:all_dashboards] = dashboard_finder.find_all_paths(project)
     else
-      result = dashboard_finder.find(project, current_user, environment)
+      result = dashboard_finder.find(project, current_user, environment: environment)
     end
     respond_to do |format|

app/controllers/projects/forks_controller.rb

@@ -62,6 +62,6 @@ class Projects::ForksController < Projects::ApplicationController
   # rubocop: enable CodeReuse/ActiveRecord
   def whitelist_query_limiting
-    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42335')
+    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-foss/issues/42335')
   end
 end

app/controllers/projects/issues_controller.rb

@@ -277,10 +277,10 @@ class Projects::IssuesController < Projects::ApplicationController
   def whitelist_query_limiting
     # Also see the following issues:
     #
-    # 1. https://gitlab.com/gitlab-org/gitlab-ce/issues/42423
-    # 2. https://gitlab.com/gitlab-org/gitlab-ce/issues/42424
-    # 3. https://gitlab.com/gitlab-org/gitlab-ce/issues/42426
-    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42422')
+    # 1. https://gitlab.com/gitlab-org/gitlab-foss/issues/42423
+    # 2. https://gitlab.com/gitlab-org/gitlab-foss/issues/42424
+    # 3. https://gitlab.com/gitlab-org/gitlab-foss/issues/42426
+    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-foss/issues/42422')
   end
 end

app/controllers/projects/jobs_controller.rb

@@ -96,7 +96,7 @@ class Projects::JobsController < Projects::ApplicationController
   end
   def json_trace
-    # will be implemented with https://gitlab.com/gitlab-org/gitlab-ce/issues/66454
+    # will be implemented with https://gitlab.com/gitlab-org/gitlab-foss/issues/66454
   end
   def retry

app/controllers/projects/merge_requests/creations_controller.rb

@@ -12,7 +12,7 @@ class Projects::MergeRequests::CreationsController < Projects::MergeRequests::Ap
   before_action :build_merge_request, except: [:create]
   def new
-    # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/40934
+    # n+1: https://gitlab.com/gitlab-org/gitlab-foss/issues/40934
     Gitlab::GitalyClient.allow_n_plus_1_calls do
       define_new_vars
     end
@@ -92,7 +92,7 @@ class Projects::MergeRequests::CreationsController < Projects::MergeRequests::Ap
   def build_merge_request
     params[:merge_request] ||= ActionController::Parameters.new(source_project: @project)
-    # Gitaly N+1 issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/58096
+    # Gitaly N+1 issue: https://gitlab.com/gitlab-org/gitlab-foss/issues/58096
     Gitlab::GitalyClient.allow_n_plus_1_calls do
       @merge_request = ::MergeRequests::BuildService.new(project, current_user, merge_request_params.merge(diff_options: diff_options)).execute
     end
@@ -135,7 +135,7 @@ class Projects::MergeRequests::CreationsController < Projects::MergeRequests::Ap
   # rubocop: enable CodeReuse/ActiveRecord
   def whitelist_query_limiting
-    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42384')
+    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-foss/issues/42384')
   end
   def incr_count_webide_merge_request

app/controllers/projects/merge_requests_controller.rb

@@ -276,7 +276,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
     if auto_merge_requested?
       if merge_request.auto_merge_enabled?
         # TODO: We should have a dedicated endpoint for updating merge params.
-        #       See https://gitlab.com/gitlab-org/gitlab-ce/issues/63130.
+        #       See https://gitlab.com/gitlab-org/gitlab-foss/issues/63130.
         AutoMergeService.new(project, current_user, merge_params).update(merge_request)
       else
         AutoMergeService.new(project, current_user, merge_params)
@@ -328,8 +328,8 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
   end
   def whitelist_query_limiting
-    # Also see https://gitlab.com/gitlab-org/gitlab-ce/issues/42441
-    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42438')
+    # Also see https://gitlab.com/gitlab-org/gitlab-foss/issues/42441
+    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-foss/issues/42438')
   end
   def reports_response(report_comparison)

app/controllers/projects/network_controller.rb

@@ -41,6 +41,6 @@ class Projects::NetworkController < Projects::ApplicationController
   end
   def whitelist_query_limiting
-    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42333')
+    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-foss/issues/42333')
   end
 end

app/controllers/projects/notes_controller.rb

@@ -86,6 +86,6 @@ class Projects::NotesController < Projects::ApplicationController
   end
   def whitelist_query_limiting
-    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42383')
+    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-foss/issues/42383')
   end
 end

app/controllers/projects/pipelines_controller.rb

@@ -204,8 +204,8 @@ class Projects::PipelinesController < Projects::ApplicationController
   end
   def whitelist_query_limiting
-    # Also see https://gitlab.com/gitlab-org/gitlab-ce/issues/42343
-    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42339')
+    # Also see https://gitlab.com/gitlab-org/gitlab-foss/issues/42343
+    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-foss/issues/42339')
   end
   def authorize_update_pipeline!

app/controllers/projects/templates_controller.rb

@@ -13,6 +13,14 @@ class Projects::TemplatesController < Projects::ApplicationController
     end
   end
+  def names
+    templates = @template_type.dropdown_names(project)
+
+    respond_to do |format|
+      format.json { render json: templates }
+    end
+  end
+
   private
   # User must have:

app/controllers/projects_controller.rb

@@ -457,7 +457,7 @@ class ProjectsController < Projects::ApplicationController
   end
   def whitelist_query_limiting
-    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42440')
+    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-foss/issues/42440')
   end
   def present_project

app/controllers/registrations_controller.rb

@@ -124,7 +124,7 @@ class RegistrationsController < Devise::RegistrationsController
   end
   def whitelist_query_limiting
-    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42380')
+    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-foss/issues/42380')
   end
   def ensure_terms_accepted