Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 3 deletions

diff --git a/app/assets/javascripts/projects/new/components/new_project_url_select.vue b/app/assets/javascripts/projects/new/components/new_project_url_select.vue
index 506f1ec5ffd..e6a02a0d67d 100644
--- a/app/assets/javascripts/projects/new/components/new_project_url_select.vue
+++ b/app/assets/javascripts/projects/new/components/new_project_url_select.vue
@@ -7,6 +7,7 @@ import {
   GlDropdownText,
   GlDropdownSectionHeader,
   GlSearchBoxByType,
+  GlTruncate,
 } from '@gitlab/ui';
 import { joinPaths, PATH_SEPARATOR } from '~/lib/utils/url_utility';
 import { MINIMUM_SEARCH_LENGTH } from '~/graphql_shared/constants';
@@ -26,6 +27,7 @@ export default {
     GlDropdownText,
     GlDropdownSectionHeader,
     GlSearchBoxByType,
+    GlTruncate,
   },
   mixins: [Tracking.mixin()],
   apollo: {
@@ -137,13 +139,20 @@ export default {
     >
 
     <gl-dropdown
-      :text="selectedNamespace.fullPath"
       class="js-group-namespace-dropdown gl-flex-grow-1"
       :toggle-class="`gl-rounded-top-right-base! gl-rounded-bottom-right-base! gl-w-20 ${dropdownPlaceholderClass}`"
       data-qa-selector="select_namespace_dropdown"
       @show="track('activate_form_input', { label: trackLabel, property: 'project_path' })"
       @shown="handleDropdownShown"
     >
+      <template #button-text>
+        <gl-truncate
+          v-if="selectedNamespace.fullPath"
+          :text="selectedNamespace.fullPath"
+          position="start"
+          with-tooltip
+        />
+      </template>
       <gl-search-box-by-type
         ref="search"
         v-model.trim="search"
diff --git a/app/assets/javascripts/projects/project_visibility.js b/app/assets/javascripts/projects/project_visibility.js
index d299e106b14..2a4916ecabf 100644
--- a/app/assets/javascripts/projects/project_visibility.js
+++ b/app/assets/javascripts/projects/project_visibility.js
@@ -10,7 +10,7 @@ const visibilityLevel = {
 };
 
 function setVisibilityOptions({ name, visibility, showPath, editPath }) {
-  document.querySelectorAll('.visibility-level-setting .form-check').forEach((option) => {
+  document.querySelectorAll('.visibility-level-setting .gl-form-radio').forEach((option) => {
     // Don't change anything if the option is restricted by admin
     if (option.classList.contains('restricted')) {
       return;
@@ -24,7 +24,7 @@ function setVisibilityOptions({ name, visibility, showPath, editPath }) {
       optionInput.disabled = true;
       const reason = option.querySelector('.option-disabled-reason');
       if (reason) {
-        const optionTitle = option.querySelector('.option-title');
+        const optionTitle = option.querySelector('.form-check-label span');
         const optionName = optionTitle ? optionTitle.innerText.toLowerCase() : '';
         reason.innerHTML = sprintf(
           __(