Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/clusters/components/uninstall_application_confirmation_modal.vue

@@ -1,6 +1,5 @@
 <script>
-/* eslint-disable vue/no-v-html */
-import { GlModal } from '@gitlab/ui';
+import { GlModal, GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui';
 import trackUninstallButtonClickMixin from 'ee_else_ce/clusters/mixins/track_uninstall_button_click';
 import { sprintf, s__ } from '~/locale';
 import {
@@ -45,6 +44,9 @@ export default {
   components: {
     GlModal,
   },
+  directives: {
+    SafeHtml,
+  },
   mixins: [trackUninstallButtonClickMixin],
   props: {
     application: {
@@ -94,6 +96,6 @@ export default {
     :title="title"
     @ok="confirmUninstall()"
   >
-    {{ warningText }} <span v-html="customAppWarningText"></span>
+    {{ warningText }} <span v-safe-html="customAppWarningText"></span>
   </gl-modal>
 </template>

app/models/namespace.rb

@@ -83,6 +83,7 @@ class Namespace < ApplicationRecord
 
   scope :for_user, -> { where('type IS NULL') }
   scope :sort_by_type, -> { order(Gitlab::Database.nulls_first_order(:type)) }
+  scope :include_route, -> { includes(:route) }
 
   scope :with_statistics, -> do
     joins('LEFT JOIN project_statistics ps ON ps.namespace_id = namespaces.id')

lib/api/namespaces.rb

@@ -32,7 +32,9 @@ module API
       get do
         namespaces = current_user.admin ? Namespace.all : current_user.namespaces
 
-        namespaces = namespaces.include_gitlab_subscription if Gitlab.ee?
+        namespaces = namespaces.include_route
+
+        namespaces = namespaces.include_gitlab_subscription_with_hosted_plan if Gitlab.ee?
 
         namespaces = namespaces.search(params[:search]) if params[:search].present?
 

lib/gitlab/graphql/authorize/authorize_resource.rb

@@ -29,8 +29,8 @@ module Gitlab
           raise NotImplementedError, "Implement #find_object in #{self.class.name}"
         end
 
-        def authorized_find!(*args)
-          object = Graphql::Lazy.force(find_object(*args))
+        def authorized_find!(*args, **kwargs)
+          object = Graphql::Lazy.force(find_object(*args, **kwargs))
 
           authorize!(object)