Add latest changes from gitlab-org/gitlab@master

14 files changed, 23 insertions, 16 deletions

diff --git a/config/README.md b/config/README.md
index 9226f71a374..7f3125cefd2 100644
--- a/config/README.md
+++ b/config/README.md
@@ -1,7 +1,7 @@
 # Configuration files Documentation
 
 Note that most configuration files (`config/*.*`) committed into
-[gitlab-ce](https://gitlab.com/gitlab-org/gitlab-ce) **will not be used** for
+[gitlab-ce](https://gitlab.com/gitlab-org/gitlab-foss) **will not be used** for
 [omnibus-gitlab](https://gitlab.com/gitlab-org/omnibus-gitlab). Configuration
 files committed into gitlab-ce are only used for development.
 
diff --git a/config/application.rb b/config/application.rb
index 81889561473..c1e3b6f7a20 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -194,7 +194,7 @@ module Gitlab
     config.assets.precompile << "snowplow/sp.js"
 
     # This path must come last to avoid confusing sprockets
-    # See https://gitlab.com/gitlab-org/gitlab-ce/issues/64091#note_194512508
+    # See https://gitlab.com/gitlab-org/gitlab-foss/issues/64091#note_194512508
     config.assets.paths << "#{config.root}/node_modules"
 
     # Compile non-JS/CSS assets in the ee/app/assets folder by default
diff --git a/config/initializers/01_secret_token.rb b/config/initializers/01_secret_token.rb
index 9225a99a584..e3fefeab81c 100644
--- a/config/initializers/01_secret_token.rb
+++ b/config/initializers/01_secret_token.rb
@@ -5,7 +5,7 @@
 # because Rails doesn't have write access.
 #
 # As an example:
-# * https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/27581
+# * https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/27581
 # * https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/3267
 #
 #
diff --git a/config/initializers/active_record_data_types.rb b/config/initializers/active_record_data_types.rb
index 846f28e6f66..2b3f58330e3 100644
--- a/config/initializers/active_record_data_types.rb
+++ b/config/initializers/active_record_data_types.rb
@@ -1,5 +1,5 @@
 # ActiveRecord custom data type for storing datetimes with timezone information.
-# See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11229
+# See https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/11229
 
 require 'active_record/connection_adapters/postgresql_adapter'
 
diff --git a/config/initializers/active_record_table_definition.rb b/config/initializers/active_record_table_definition.rb
index a71069f27a3..81a8e5906f4 100644
--- a/config/initializers/active_record_table_definition.rb
+++ b/config/initializers/active_record_table_definition.rb
@@ -1,5 +1,5 @@
 # ActiveRecord custom method definitions with timezone information.
-# See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11229
+# See https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/11229
 
 require 'active_record/connection_adapters/abstract/schema_definitions'
 
diff --git a/config/initializers/countries.rb b/config/initializers/countries.rb
index d65ae19852f..9f8592ba641 100644
--- a/config/initializers/countries.rb
+++ b/config/initializers/countries.rb
@@ -6,7 +6,7 @@ end
 
 # GitLab permits users to sign up in Ukraine except the Crimean Region: https://about.gitlab.com/handbook/people-operations/code-of-conduct/#trade-compliance-exportimport-control
 # This overrides the display name for Ukraine to Ukraine (except Crimean Region)
-# To be removed after https://gitlab.com/gitlab-org/gitlab-ee/issues/14784 is implemented
+# To be removed after https://gitlab.com/gitlab-org/gitlab/issues/14784 is implemented
 # Data fetched is based on https://github.com/hexorx/countries/blob/master/lib/countries/data/countries/UA.yaml
 ISO3166::Data.register(
   continent: "Europe",
diff --git a/config/initializers/fog_google_https_private_urls.rb b/config/initializers/fog_google_https_private_urls.rb
index 682b1050c68..ef6afb2b686 100644
--- a/config/initializers/fog_google_https_private_urls.rb
+++ b/config/initializers/fog_google_https_private_urls.rb
@@ -1,6 +1,6 @@
 #
 # Monkey patching the https support for private urls
-# See https://gitlab.com/gitlab-org/gitlab-ee/issues/4879
+# See https://gitlab.com/gitlab-org/gitlab/issues/4879
 #
 module Fog
   module Storage
diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb
index fcc6bfa5c92..48daca3d254 100644
--- a/config/initializers/sentry.rb
+++ b/config/initializers/sentry.rb
@@ -14,7 +14,7 @@ def configure_sentry
       # Sanitize authentication headers
       config.sanitize_http_headers = %w[Authorization Private-Token]
       config.tags = { program: Gitlab.process_name }
-      # Debugging for https://gitlab.com/gitlab-org/gitlab-ce/issues/57727
+      # Debugging for https://gitlab.com/gitlab-org/gitlab-foss/issues/57727
       config.before_send = lambda do |event, hint|
         if ActiveModel::MissingAttributeError === hint[:exception]
           columns_hash = ActiveRecord::Base
diff --git a/config/initializers/zz_metrics.rb b/config/initializers/zz_metrics.rb
index af4aec7b355..501ec8ccc06 100644
--- a/config/initializers/zz_metrics.rb
+++ b/config/initializers/zz_metrics.rb
@@ -1,5 +1,5 @@
 # This file was prefixed with zz_ because we want to load it the last!
-# See: https://gitlab.com/gitlab-org/gitlab-ce/issues/55611
+# See: https://gitlab.com/gitlab-org/gitlab-foss/issues/55611
 
 # Autoload all classes that we want to instrument, and instrument the methods we
 # need. This takes the Gitlab::Metrics::Instrumentation module as an argument so
@@ -115,7 +115,7 @@ def instrument_classes(instrumentation)
   # This is a Rails scope so we have to instrument it manually.
   instrumentation.instrument_method(Project, :visible_to_user)
 
-  # Needed for https://gitlab.com/gitlab-org/gitlab-ce/issues/30224#note_32306159
+  # Needed for https://gitlab.com/gitlab-org/gitlab-foss/issues/30224#note_32306159
   instrumentation.instrument_instance_method(MergeRequestDiff, :load_commits)
 end
 # rubocop:enable Metrics/AbcSize
@@ -126,7 +126,7 @@ end
 # We should deprecate the usage of `any_instance_of` in the future
 # check: https://github.com/rspec/rspec-mocks#settings-mocks-or-stubs-on-any-instance-of-a-class
 #
-# Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/33587
+# Related issue: https://gitlab.com/gitlab-org/gitlab-foss/issues/33587
 #
 # In development mode, we turn off eager loading when we're running
 # `rails generate migration` because eager loading short-circuits the
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 554e9913faa..e5fee6dbb6c 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -63,7 +63,7 @@ de:
     - :month
     - :year
   datetime:
-    # used in a custom scope that has been created to fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32747
+    # used in a custom scope that has been created to fix https://gitlab.com/gitlab-org/gitlab-foss/issues/32747
     time_ago_in_words:
       half_a_minute: vor einer halben Minute
       less_than_x_seconds:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 78c07583933..e336865b2a5 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -62,7 +62,7 @@ es:
     - :month
     - :year
   datetime:
-    # used in a custom scope that has been created to fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32747
+    # used in a custom scope that has been created to fix https://gitlab.com/gitlab-org/gitlab-foss/issues/32747
     time_ago_in_words:
       half_a_minute: "hace medio minuto"
       less_than_x_seconds:
diff --git a/config/routes.rb b/config/routes.rb
index 129f4b68212..4319431ed48 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -28,7 +28,7 @@ Rails.application.routes.draw do
   end
 
   # This prefixless path is required because Jira gets confused if we set it up with a path
-  # More information: https://gitlab.com/gitlab-org/gitlab-ee/issues/6752
+  # More information: https://gitlab.com/gitlab-org/gitlab/issues/6752
   scope path: '/login/oauth', controller: 'oauth/jira/authorizations', as: :oauth_jira do
     Gitlab.ee do
       get :authorize, action: :new
@@ -143,7 +143,8 @@ Rails.application.routes.draw do
       member do
         Gitlab.ee do
           get :metrics, format: :json
-          get '/prometheus/api/v1/*proxy_path', to: 'clusters#prometheus_proxy', as: :prometheus_api
+          get :metrics_dashboard
+          get :'/prometheus/api/v1/*proxy_path', to: 'clusters#prometheus_proxy', as: :prometheus_api
         end
 
         scope :applications do
diff --git a/config/routes/group.rb b/config/routes/group.rb
index 2cf9eb82447..37bc6085931 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -17,7 +17,7 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
       get :details, as: :details_group
       get :activity, as: :activity_group
       put :transfer, as: :transfer_group
-      # TODO: Remove as part of refactor in https://gitlab.com/gitlab-org/gitlab-ce/issues/49693
+      # TODO: Remove as part of refactor in https://gitlab.com/gitlab-org/gitlab-foss/issues/49693
       get 'shared', action: :show, as: :group_shared
       get 'archived', action: :show, as: :group_archived
     end
diff --git a/config/routes/project.rb b/config/routes/project.rb
index c1273db8ee5..4a2898915b1 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -195,6 +195,12 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           defaults: { format: 'json' },
           constraints: { key: %r{[^/]+}, template_type: %r{issue|merge_request}, format: 'json' }
 
+      get '/description_templates/names/:template_type',
+          to: 'templates#names',
+          as: :template_names,
+          defaults: { format: 'json' },
+          constraints: { template_type: %r{issue|merge_request}, format: 'json' }
+
       resources :commit, only: [:show], constraints: { id: /\h{7,40}/ } do
         member do
           get :branches