Add latest changes from gitlab-org/gitlab@master

32 files changed, 53 insertions, 41 deletions

diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index 03e935fceae..fbf63997b15 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -69,7 +69,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
   end
 
   def whitelist_query_limiting
-    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/63107')
+    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-foss/issues/63107')
   end
 
   def application_setting_params
@@ -86,7 +86,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
 
     params[:application_setting][:import_sources]&.delete("")
     params[:application_setting][:restricted_visibility_levels]&.delete("")
-    # TODO Remove domain_blacklist_raw in APIv5 (See https://gitlab.com/gitlab-org/gitlab-ce/issues/67204)
+    # TODO Remove domain_blacklist_raw in APIv5 (See https://gitlab.com/gitlab-org/gitlab-foss/issues/67204)
     params.delete(:domain_blacklist_raw) if params[:domain_blacklist_file]
     params.delete(:domain_blacklist_raw) if params[:domain_blacklist]
     params.delete(:domain_whitelist_raw) if params[:domain_whitelist]
diff --git a/app/controllers/admin/clusters_controller.rb b/app/controllers/admin/clusters_controller.rb
index f54933de10f..5b1902fad51 100644
--- a/app/controllers/admin/clusters_controller.rb
+++ b/app/controllers/admin/clusters_controller.rb
@@ -11,3 +11,5 @@ class Admin::ClustersController < Clusters::ClustersController
     @clusterable ||= InstanceClusterablePresenter.fabricate(Clusters::Instance.new, current_user: current_user)
   end
 end
+
+Admin::ClustersController.prepend_if_ee('EE::Admin::ClustersController')
diff --git a/app/controllers/admin/services_controller.rb b/app/controllers/admin/services_controller.rb
index c455930c044..e31e0e09978 100644
--- a/app/controllers/admin/services_controller.rb
+++ b/app/controllers/admin/services_controller.rb
@@ -46,6 +46,6 @@ class Admin::ServicesController < Admin::ApplicationController
   # rubocop: enable CodeReuse/ActiveRecord
 
   def whitelist_query_limiting
-    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42430')
+    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-foss/issues/42430')
   end
 end
diff --git a/app/controllers/boards/issues_controller.rb b/app/controllers/boards/issues_controller.rb
index 1d1a72d21f1..9894dd7d180 100644
--- a/app/controllers/boards/issues_controller.rb
+++ b/app/controllers/boards/issues_controller.rb
@@ -130,8 +130,8 @@ module Boards
     end
 
     def whitelist_query_limiting
-      # Also see https://gitlab.com/gitlab-org/gitlab-ce/issues/42439
-      Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42428')
+      # Also see https://gitlab.com/gitlab-org/gitlab-foss/issues/42439
+      Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-foss/issues/42428')
     end
 
     def validate_id_list
diff --git a/app/controllers/boards/lists_controller.rb b/app/controllers/boards/lists_controller.rb
index 7633e2aedd2..d0f4904c34e 100644
--- a/app/controllers/boards/lists_controller.rb
+++ b/app/controllers/boards/lists_controller.rb
@@ -25,7 +25,7 @@ module Boards
     end
 
     def update
-      list = board.lists.movable.find(params[:id])
+      list = board.lists.find(params[:id])
       service = Boards::Lists::UpdateService.new(board_parent, current_user, update_list_params)
       result = service.execute(list)
 
diff --git a/app/controllers/clusters/clusters_controller.rb b/app/controllers/clusters/clusters_controller.rb
index b55061b5dc6..15f1e8284ff 100644
--- a/app/controllers/clusters/clusters_controller.rb
+++ b/app/controllers/clusters/clusters_controller.rb
@@ -31,7 +31,7 @@ class Clusters::ClustersController < Clusters::BaseController
     # In EE (Premium) we can have any number, as multiple clusters are
     # supported, but the number of clusters are fairly low currently.
     #
-    # See https://gitlab.com/gitlab-org/gitlab-ce/issues/55260 also.
+    # See https://gitlab.com/gitlab-org/gitlab-foss/issues/55260 also.
     @clusters = Kaminari.paginate_array(clusters).page(params[:page]).per(20)
 
     @has_ancestor_clusters = finder.has_ancestor_clusters?
diff --git a/app/controllers/concerns/record_user_last_activity.rb b/app/controllers/concerns/record_user_last_activity.rb
index 372c803278d..a394ef9a2b8 100644
--- a/app/controllers/concerns/record_user_last_activity.rb
+++ b/app/controllers/concerns/record_user_last_activity.rb
@@ -6,7 +6,7 @@
 # for any authenticated GET request. The DB update will only happen once per day.
 #
 # In order to determine if you should include this concern or not, please check the
-# description and discussion on this issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/54947
+# description and discussion on this issue: https://gitlab.com/gitlab-org/gitlab-foss/issues/54947
 module RecordUserLastActivity
   include CookiesHelper
   extend ActiveSupport::Concern
diff --git a/app/controllers/dashboard/milestones_controller.rb b/app/controllers/dashboard/milestones_controller.rb
index 912036da0ea..d34a07324da 100644
--- a/app/controllers/dashboard/milestones_controller.rb
+++ b/app/controllers/dashboard/milestones_controller.rb
@@ -28,7 +28,7 @@ class Dashboard::MilestonesController < Dashboard::ApplicationController
     DashboardGroupMilestone.build_collection(groups, params)
   end
 
-  # See [#39545](https://gitlab.com/gitlab-org/gitlab-ce/issues/39545) for info about the deprecation of dynamic milestones
+  # See [#39545](https://gitlab.com/gitlab-org/gitlab-foss/issues/39545) for info about the deprecation of dynamic milestones
   def dynamic_milestones
     DashboardMilestone.build_collection(@projects, params)
   end
diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb
index 6457732dff0..9659d7719b9 100644
--- a/app/controllers/dashboard/projects_controller.rb
+++ b/app/controllers/dashboard/projects_controller.rb
@@ -55,7 +55,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
   end
 
   def render_projects
-    # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/40260
+    # n+1: https://gitlab.com/gitlab-org/gitlab-foss/issues/40260
     Gitlab::GitalyClient.allow_n_plus_1_calls do
       render
     end
diff --git a/app/controllers/dashboard/todos_controller.rb b/app/controllers/dashboard/todos_controller.rb
index 940d1482611..7012bfcefe3 100644
--- a/app/controllers/dashboard/todos_controller.rb
+++ b/app/controllers/dashboard/todos_controller.rb
@@ -84,7 +84,7 @@ class Dashboard::TodosController < Dashboard::ApplicationController
   end
 
   def todos_page_count(todos)
-    if todo_params.except(:sort, :page).empty? # rubocop: disable CodeReuse/ActiveRecord
+    if todo_params.except(:sort, :page).empty?
       (current_user.todos_pending_count.to_f / todos.limit_value).ceil
     else
       todos.total_pages
diff --git a/app/controllers/groups/runners_controller.rb b/app/controllers/groups/runners_controller.rb
index af2b2cbd1fd..635c248024e 100644
--- a/app/controllers/groups/runners_controller.rb
+++ b/app/controllers/groups/runners_controller.rb
@@ -2,7 +2,7 @@
 
 class Groups::RunnersController < Groups::ApplicationController
   # Proper policies should be implemented per
-  # https://gitlab.com/gitlab-org/gitlab-ce/issues/45894
+  # https://gitlab.com/gitlab-org/gitlab-foss/issues/45894
   before_action :authorize_admin_group!
 
   before_action :runner, only: [:edit, :update, :destroy, :pause, :resume, :show]
diff --git a/app/controllers/import/github_controller.rb b/app/controllers/import/github_controller.rb
index 1cea0299fb2..72f830fc9a1 100644
--- a/app/controllers/import/github_controller.rb
+++ b/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|
diff --git a/app/controllers/import/gitlab_projects_controller.rb b/app/controllers/import/gitlab_projects_controller.rb
index 89889141be6..c9c487cec26 100644
--- a/app/controllers/import/gitlab_projects_controller.rb
+++ b/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
diff --git a/app/controllers/import/manifest_controller.rb b/app/controllers/import/manifest_controller.rb
index 320cd45b925..7ba8b3ce938 100644
--- a/app/controllers/import/manifest_controller.rb
+++ b/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
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb
index 4125f44d00a..7c3d43fb49a 100644
--- a/app/controllers/projects/blob_controller.rb
+++ b/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
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb
index e7bdb4b2042..c125ed3605a 100644
--- a/app/controllers/projects/branches_controller.rb
+++ b/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
diff --git a/app/controllers/projects/clusters_controller.rb b/app/controllers/projects/clusters_controller.rb
index 98cd66cf6f9..079d30127d6 100644
--- a/app/controllers/projects/clusters_controller.rb
+++ b/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')
diff --git a/app/controllers/projects/commits_controller.rb b/app/controllers/projects/commits_controller.rb
index f540ccee386..76705b4410c 100644
--- a/app/controllers/projects/commits_controller.rb
+++ b/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
diff --git a/app/controllers/projects/cycle_analytics_controller.rb b/app/controllers/projects/cycle_analytics_controller.rb
index 3b0abecf2c9..b9d7dbd37be 100644
--- a/app/controllers/projects/cycle_analytics_controller.rb
+++ b/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
diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb
index 7f776b8b497..64de0e665d3 100644
--- a/app/controllers/projects/environments_controller.rb
+++ b/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|
diff --git a/app/controllers/projects/forks_controller.rb b/app/controllers/projects/forks_controller.rb
index 1bb21857dcf..cb6d9c2ba18 100644
--- a/app/controllers/projects/forks_controller.rb
+++ b/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
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index a3dcb36aa3b..7a192a9ec2d 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/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
 
diff --git a/app/controllers/projects/jobs_controller.rb b/app/controllers/projects/jobs_controller.rb
index c83d4e307a7..0fdd4d4f33d 100644
--- a/app/controllers/projects/jobs_controller.rb
+++ b/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
diff --git a/app/controllers/projects/merge_requests/creations_controller.rb b/app/controllers/projects/merge_requests/creations_controller.rb
index 6ac5bb90706..808265634da 100644
--- a/app/controllers/projects/merge_requests/creations_controller.rb
+++ b/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
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index af87e04f9c8..e51ce752233 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/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)
diff --git a/app/controllers/projects/network_controller.rb b/app/controllers/projects/network_controller.rb
index 6543711ecfa..47788438da9 100644
--- a/app/controllers/projects/network_controller.rb
+++ b/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
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb
index 13e8453ed00..c0b8c9e550d 100644
--- a/app/controllers/projects/notes_controller.rb
+++ b/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
diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index 477ba36e9d1..cfa46705483 100644
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/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!
diff --git a/app/controllers/projects/templates_controller.rb b/app/controllers/projects/templates_controller.rb
index f987033a26c..95739f96d39 100644
--- a/app/controllers/projects/templates_controller.rb
+++ b/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:
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index a6ed783b433..b8beecf823c 100644
--- a/app/controllers/projects_controller.rb
+++ b/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
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index a973ed23da9..2e4c6a801b0 100644
--- a/app/controllers/registrations_controller.rb
+++ b/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
diff --git a/app/controllers/root_controller.rb b/app/controllers/root_controller.rb
index 310ae17abbf..5b06f4f4b51 100644
--- a/app/controllers/root_controller.rb
+++ b/app/controllers/root_controller.rb
@@ -15,7 +15,7 @@ class RootController < Dashboard::ProjectsController
   before_action :redirect_logged_user, if: -> { current_user.present? }
 
   def index
-    # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/40260
+    # n+1: https://gitlab.com/gitlab-org/gitlab-foss/issues/40260
     Gitlab::GitalyClient.allow_n_plus_1_calls do
       super
     end