Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

GITLAB_PAGES_VERSION

@@ -1 +1 @@
-52935d26b797c63c6aa31047cd1319cfddb5bb1c
+7999217addae25ef054b769e74265cbd2ad28bad

app/assets/javascripts/admin/organizations/index/components/app.vue

@@ -16,7 +16,7 @@ export default {
     ),
   },
   components: { GlButton, OrganizationsView },
-  inject: ['newOrganizationUrl'],
+  inject: ['newOrganizationUrl', 'canCreateOrganization'],
   data() {
     return {
       organizations: {},
@@ -46,9 +46,6 @@ export default {
     showHeader() {
       return this.loading || this.organizations.nodes?.length;
     },
-    showNewOrganizationButton() {
-      return gon.features?.allowOrganizationCreation;
-    },
     loading() {
       return this.$apollo.queries.organizations.loading;
     },
@@ -78,7 +75,7 @@ export default {
   <div class="gl-py-6">
     <div v-if="showHeader" class="gl-mb-5 gl-flex gl-items-center gl-justify-between">
       <h1 class="gl-m-0 gl-text-size-h-display">{{ $options.i18n.pageTitle }}</h1>
-      <gl-button v-if="showNewOrganizationButton" :href="newOrganizationUrl" variant="confirm">{{
+      <gl-button v-if="canCreateOrganization" :href="newOrganizationUrl" variant="confirm">{{
         $options.i18n.newOrganization
       }}</gl-button>
     </div>

app/assets/javascripts/admin/organizations/index/index.js

@@ -12,7 +12,9 @@ export const initAdminOrganizationsIndex = () => {
   const {
     dataset: { appData },
   } = el;
-  const { newOrganizationUrl } = convertObjectPropsToCamelCase(JSON.parse(appData));
+  const { newOrganizationUrl, canCreateOrganization } = convertObjectPropsToCamelCase(
+    JSON.parse(appData),
+  );
 
   const apolloProvider = new VueApollo({
     defaultClient: createDefaultClient(),
@@ -24,6 +26,7 @@ export const initAdminOrganizationsIndex = () => {
     apolloProvider,
     provide: {
       newOrganizationUrl,
+      canCreateOrganization,
     },
     render(createElement) {
       return createElement(App);

app/assets/javascripts/organizations/index/components/app.vue

@@ -19,7 +19,7 @@ export default {
     GlButton,
     OrganizationsView,
   },
-  inject: ['newOrganizationUrl'],
+  inject: ['newOrganizationUrl', 'canCreateOrganization'],
   data() {
     return {
       organizations: {},
@@ -49,9 +49,6 @@ export default {
     showHeader() {
       return this.loading || this.organizations.nodes?.length;
     },
-    showNewOrganizationButton() {
-      return gon.features?.allowOrganizationCreation;
-    },
     loading() {
       return this.$apollo.queries.organizations.loading;
     },
@@ -82,7 +79,7 @@ export default {
     <div v-if="showHeader" class="gl-flex gl-items-center">
       <h1 class="gl-my-4 gl-text-size-h-display">{{ $options.i18n.organizations }}</h1>
       <div class="gl-ml-auto">
-        <gl-button v-if="showNewOrganizationButton" :href="newOrganizationUrl" variant="confirm">{{
+        <gl-button v-if="canCreateOrganization" :href="newOrganizationUrl" variant="confirm">{{
           $options.i18n.newOrganization
         }}</gl-button>
       </div>

app/assets/javascripts/organizations/index/index.js

@@ -13,14 +13,20 @@ export const initOrganizationsIndex = () => {
     defaultClient: createDefaultClient(),
   });
 
-  const { newOrganizationUrl } = convertObjectPropsToCamelCase(el.dataset);
+  const {
+    dataset: { appData },
+  } = el;
+  const { newOrganizationUrl, canCreateOrganization } = convertObjectPropsToCamelCase(
+    JSON.parse(appData),
+  );
 
   return new Vue({
     el,
     name: 'OrganizationsIndexRoot',
     apolloProvider,
     provide: {
       newOrganizationUrl,
+      canCreateOrganization,
     },
     render(createElement) {
       return createElement(OrganizationsIndexApp);

app/assets/javascripts/organizations/shared/components/organizations_view.vue

@@ -18,7 +18,7 @@ export default {
     OrganizationsList,
     GlEmptyState,
   },
-  inject: ['newOrganizationUrl'],
+  inject: ['newOrganizationUrl', 'canCreateOrganization'],
   props: {
     organizations: {
       type: Object,
@@ -43,7 +43,7 @@ export default {
         description: this.$options.i18n.emptyStateDescription,
       };
 
-      if (gon.features?.allowOrganizationCreation) {
+      if (this.canCreateOrganization) {
         return {
           ...baseProps,
           primaryButtonLink: this.newOrganizationUrl,

app/assets/javascripts/sidebar/components/time_tracking/create_timelog_form.vue

@@ -87,6 +87,11 @@ export default {
     timeTrackingDocsPath() {
       return joinPaths(gon.relative_url_root || '', '/help/user/project/time_tracking.md');
     },
+    createTimelogModalId() {
+      return this.workItemId
+        ? `${CREATE_TIMELOG_MODAL_ID}-${this.workItemId}`
+        : CREATE_TIMELOG_MODAL_ID;
+    },
   },
   methods: {
     resetModal() {
@@ -182,15 +187,14 @@ export default {
       return convertToGraphQLId(this.getGraphQLEntityType(), this.issuableId);
     },
   },
-  CREATE_TIMELOG_MODAL_ID,
 };
 </script>
 
 <template>
   <gl-modal
     ref="modal"
     :title="s__('CreateTimelogForm|Add time entry')"
-    :modal-id="$options.CREATE_TIMELOG_MODAL_ID"
+    :modal-id="createTimelogModalId"
     size="sm"
     data-testid="create-timelog-modal"
     :action-primary="primaryProps"

app/assets/javascripts/sidebar/components/time_tracking/set_time_estimate_form.vue

@@ -115,6 +115,11 @@ export default {
         issuableTypeName,
       });
     },
+    setTimeEstimateModalId() {
+      return this.workItemId
+        ? `${SET_TIME_ESTIMATE_MODAL_ID}-${this.workItemId}`
+        : SET_TIME_ESTIMATE_MODAL_ID;
+    },
   },
   watch: {
     timeTracking() {
@@ -212,15 +217,14 @@ export default {
         });
     },
   },
-  SET_TIME_ESTIMATE_MODAL_ID,
 };
 </script>
 
 <template>
   <gl-modal
     ref="modal"
     :title="modalTitle"
-    :modal-id="$options.SET_TIME_ESTIMATE_MODAL_ID"
+    :modal-id="setTimeEstimateModalId"
     size="sm"
     data-testid="set-time-estimate-modal"
     :action-primary="primaryProps"

app/assets/javascripts/work_items/components/shared/work_item_link_child_contents.vue

@@ -220,7 +220,7 @@ export default {
             :href="childItemWebUrl"
             :class="{ '!gl-text-subtle': !isChildItemOpen }"
             class="gl-hyphens-auto gl-break-words gl-font-semibold"
-            @click.exact="handleTitleClick"
+            @click.exact.stop="handleTitleClick"
             @mouseover="$emit('mouseover')"
             @mouseout="$emit('mouseout')"
           >
@@ -241,7 +241,7 @@ export default {
           >
             <template #avatar="{ avatar }">
               <gl-avatar-link v-gl-tooltip :href="avatar.webUrl" :title="avatar.name">
-                <gl-avatar :alt="avatar.name" :src="avatar.avatarUrl" :size="16" />
+                <gl-avatar :alt="avatar.name" :src="avatar.avatarUrl" :size="16" @click.stop />
               </gl-avatar-link>
             </template>
           </gl-avatars-inline>
@@ -286,6 +286,7 @@ export default {
           :scoped="showScopedLabel(label)"
           class="gl-mb-auto gl-mr-2 gl-mt-2"
           tooltip-placement="top"
+          @click.stop
         />
       </div>
     </div>
@@ -299,7 +300,7 @@ export default {
         :aria-label="$options.i18n.remove"
         :title="$options.i18n.remove"
         data-testid="remove-work-item-link"
-        @click="$emit('removeChild', childItem)"
+        @click.stop="$emit('removeChild', childItem)"
       />
     </div>
   </div>