Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

app/assets/javascripts/blob_edit/edit_blob.js

@@ -68,9 +68,9 @@ export default class EditBlob {
       blobContent: editorEl.innerText,
     });
     this.editor.use([
+      { definition: ToolbarExtension },
       { definition: SourceEditorExtension },
       { definition: FileTemplateExtension },
-      { definition: ToolbarExtension },
     ]);
 
     fileNameEl.addEventListener('change', () => {

app/assets/javascripts/editor/constants.js

@@ -166,3 +166,4 @@ export const EXTENSION_MARKDOWN_BUTTONS = [
     },
   },
 ];
+export const EXTENSION_SOFTWRAP_ID = 'soft-wrap';

app/assets/javascripts/editor/extensions/source_editor_extension_base.js

@@ -1,8 +1,11 @@
 import { Range } from 'monaco-editor';
+import { __ } from '~/locale';
 import {
   EDITOR_TYPE_CODE,
   EXTENSION_BASE_LINE_LINK_ANCHOR_CLASS,
   EXTENSION_BASE_LINE_NUMBERS_CLASS,
+  EDITOR_TOOLBAR_RIGHT_GROUP,
+  EXTENSION_SOFTWRAP_ID,
 } from '../constants';
 
 const hashRegexp = /#?L/g;
@@ -24,6 +27,13 @@ export class SourceEditorExtension {
     return 'BaseExtension';
   }
 
+  onSetup(instance) {
+    this.toolbarButtons = [];
+    if (instance.toolbar) {
+      this.setupToolbar(instance);
+    }
+  }
+
   // eslint-disable-next-line class-methods-use-this
   onUse(instance) {
     SourceEditorExtension.highlightLines(instance);
@@ -32,6 +42,31 @@ export class SourceEditorExtension {
     }
   }
 
+  onBeforeUnuse(instance) {
+    const ids = this.toolbarButtons.map((item) => item.id);
+    if (instance.toolbar) {
+      instance.toolbar.removeItems(ids);
+    }
+  }
+
+  setupToolbar(instance) {
+    this.toolbarButtons = [
+      {
+        id: EXTENSION_SOFTWRAP_ID,
+        label: __('Soft wrap'),
+        icon: 'soft-wrap',
+        selected: instance.getOption(116) === 'on',
+        group: EDITOR_TOOLBAR_RIGHT_GROUP,
+        category: 'primary',
+        selectedLabel: __('No wrap'),
+        selectedIcon: 'soft-unwrap',
+        class: 'soft-wrap-toggle',
+        onClick: () => instance.toggleSoftwrap(),
+      },
+    ];
+    instance.toolbar.addItems(this.toolbarButtons);
+  }
+
   static onMouseMoveHandler(e) {
     const target = e.target.element;
     if (target.classList.contains(EXTENSION_BASE_LINE_NUMBERS_CLASS)) {
@@ -108,6 +143,16 @@ export class SourceEditorExtension {
       highlightLines(instance, bounds = null) {
         SourceEditorExtension.highlightLines(instance, bounds);
       },
+
+      toggleSoftwrap(instance) {
+        const isSoftWrapped = instance.getOption(116) === 'on';
+        instance.updateOptions({ wordWrap: isSoftWrapped ? 'off' : 'on' });
+        if (instance.toolbar) {
+          instance.toolbar.updateItem(EXTENSION_SOFTWRAP_ID, {
+            selected: !isSoftWrapped,
+          });
+        }
+      },
     };
   }
 }

app/assets/javascripts/invite_members/components/invite_members_trigger.vue

@@ -1,15 +1,17 @@
 <script>
-import { GlButton, GlLink, GlIcon } from '@gitlab/ui';
+import { GlButton, GlLink, GlIcon, GlDropdownItem } from '@gitlab/ui';
 import { s__ } from '~/locale';
 import eventHub from '../event_hub';
 import {
   TRIGGER_ELEMENT_BUTTON,
   TRIGGER_ELEMENT_SIDE_NAV,
   TRIGGER_DEFAULT_QA_SELECTOR,
+  TRIGGER_ELEMENT_WITH_EMOJI,
+  TRIGGER_ELEMENT_DROPDOWN_WITH_EMOJI,
 } from '../constants';
 
 export default {
-  components: { GlButton, GlLink, GlIcon },
+  components: { GlButton, GlLink, GlIcon, GlDropdownItem },
   props: {
     displayText: {
       type: String,
@@ -85,6 +87,8 @@ export default {
   },
   TRIGGER_ELEMENT_BUTTON,
   TRIGGER_ELEMENT_SIDE_NAV,
+  TRIGGER_ELEMENT_WITH_EMOJI,
+  TRIGGER_ELEMENT_DROPDOWN_WITH_EMOJI,
 };
 </script>
 
@@ -109,6 +113,23 @@ export default {
     </span>
     <span class="nav-item-name"> {{ displayText }} </span>
   </gl-link>
+  <gl-link
+    v-else-if="checkTrigger($options.TRIGGER_ELEMENT_WITH_EMOJI)"
+    v-bind="componentAttributes"
+    @click="openModal"
+  >
+    {{ displayText }}
+    <gl-emoji class="gl-vertical-align-baseline gl-reset-font-size gl-mr-1" :data-name="icon" />
+  </gl-link>
+  <gl-dropdown-item
+    v-else-if="checkTrigger($options.TRIGGER_ELEMENT_DROPDOWN_WITH_EMOJI)"
+    v-bind="componentAttributes"
+    button-class="top-nav-menu-item"
+    @click="openModal"
+  >
+    {{ displayText }}
+    <gl-emoji class="gl-vertical-align-baseline gl-reset-font-size gl-mr-1" :data-name="icon" />
+  </gl-dropdown-item>
   <gl-link v-else v-bind="componentAttributes" data-is-link="true" @click="openModal">
     {{ displayText }}
   </gl-link>

app/assets/javascripts/invite_members/constants.js

@@ -20,6 +20,9 @@ export const USERS_FILTER_ALL = 'all';
 export const USERS_FILTER_SAML_PROVIDER_ID = 'saml_provider_id';
 export const TRIGGER_ELEMENT_BUTTON = 'button';
 export const TRIGGER_ELEMENT_SIDE_NAV = 'side-nav';
+export const TOP_NAV_INVITE_MEMBERS_COMPONENT = 'invite_members';
+export const TRIGGER_ELEMENT_WITH_EMOJI = 'text-emoji';
+export const TRIGGER_ELEMENT_DROPDOWN_WITH_EMOJI = 'dropdown-text-emoji';
 export const INVITE_MEMBER_MODAL_TRACKING_CATEGORY = 'invite_members_modal';
 export const TRIGGER_DEFAULT_QA_SELECTOR = 'invite_members_button';
 export const MEMBERS_MODAL_DEFAULT_TITLE = s__('InviteMembersModal|Invite members');

app/assets/javascripts/nav/components/top_nav_new_dropdown.vue

@@ -1,12 +1,15 @@
 <script>
 import { GlDropdown, GlDropdownDivider, GlDropdownItem, GlDropdownSectionHeader } from '@gitlab/ui';
+import InviteMembersTrigger from '~/invite_members/components/invite_members_trigger.vue';
+import { TOP_NAV_INVITE_MEMBERS_COMPONENT } from '~/invite_members/constants';
 
 export default {
   components: {
     GlDropdown,
     GlDropdownDivider,
     GlDropdownItem,
     GlDropdownSectionHeader,
+    InviteMembersTrigger,
   },
   props: {
     viewModel: {
@@ -22,6 +25,11 @@ export default {
       return this.sections.length > 1;
     },
   },
+  methods: {
+    isInvitedMembers(menuItem) {
+      return menuItem.component === TOP_NAV_INVITE_MEMBERS_COMPONENT;
+    },
+  },
 };
 </script>
 
@@ -41,7 +49,16 @@ export default {
         {{ title }}
       </gl-dropdown-section-header>
       <template v-for="menuItem in menu_items">
+        <invite-members-trigger
+          v-if="isInvitedMembers(menuItem)"
+          :key="`${index}_item_${menuItem.id}`"
+          :trigger-element="`dropdown-${menuItem.data.trigger_element}`"
+          :display-text="menuItem.title"
+          :icon="menuItem.icon"
+          :trigger-source="menuItem.data.trigger_source"
+        />
         <gl-dropdown-item
+          v-else
           :key="`${index}_item_${menuItem.id}`"
           link-class="top-nav-menu-item"
           :href="menuItem.href"

app/assets/javascripts/pages/shared/wikis/wikis.js

@@ -16,6 +16,17 @@ export default class Wikis {
       sidebarToggles[i].addEventListener('click', (e) => this.handleToggleSidebar(e));
     }
 
+    const listToggles = document.querySelectorAll('.js-wiki-list-toggle');
+
+    listToggles.forEach((listToggle) => {
+      listToggle.querySelector('.js-wiki-list-expand-button')?.addEventListener('click', () => {
+        listToggle.classList.remove('collapsed');
+      });
+      listToggle.querySelector('.js-wiki-list-collapse-button')?.addEventListener('click', () => {
+        listToggle.classList.add('collapsed');
+      });
+    });
+
     window.addEventListener('resize', () => this.renderSidebar());
     this.renderSidebar();
 

app/assets/stylesheets/page_bundles/wiki.scss

@@ -106,6 +106,23 @@
     color: var(--black, $black);
   }
 
+  .active > .wiki-list {
+    a,
+    .wiki-list-expand-button,
+    .wiki-list-collapse-button {
+      color: var(--black, $black);
+    }
+  }
+
+  .wiki-list-expand-button,
+  .wiki-list-collapse-button {
+    color: var(--gray-400, $gray-400);
+
+    &:hover {
+      color: var(--black, $black);
+    }
+  }
+
   ul.wiki-pages,
   ul.wiki-pages li {
     list-style: none;
@@ -118,7 +135,7 @@
   }
 
   ul.wiki-pages ul {
-    padding-left: 15px;
+    padding-left: 20px;
   }
 
   .wiki-sidebar-header {
@@ -153,3 +170,28 @@ ul.wiki-pages-list.content-list {
 .wiki-form .markdown-area {
   max-height: 55vh;
 }
+
+.wiki-list {
+  .wiki-list-expand-button,
+  .wiki-list-collapse-button {
+    left: -$gl-spacing-scale-5;
+  }
+
+  .wiki-list-expand-button {
+    display: none;
+  }
+
+  &.collapsed {
+    .wiki-list-collapse-button {
+      display: none;
+    }
+
+    .wiki-list-expand-button {
+      display: block;
+    }
+  }
+
+  &.collapsed + ul {
+    display: none;
+  }
+}

app/helpers/nav/new_dropdown_helper.rb

@@ -53,12 +53,7 @@ def group_menu_section(group)
       menu_items.push(create_epic_menu_item(group))
 
       if can?(current_user, :admin_group_member, group)
-        menu_items.push(
-          invite_members_menu_item(
-            href: group_group_members_path(group),
-            partial: 'groups/invite_members_top_nav_link'
-          )
-        )
+        menu_items.push(invite_members_menu_item(partial: 'groups/invite_members_top_nav_link'))
       end
 
       {
@@ -105,12 +100,7 @@ def project_menu_section(project)
       end
 
       if can_admin_project_member?(project)
-        menu_items.push(
-          invite_members_menu_item(
-            href: project_project_members_path(project),
-            partial: 'projects/invite_members_top_nav_link'
-          )
-        )
+        menu_items.push(invite_members_menu_item(partial: 'projects/invite_members_top_nav_link'))
       end
 
       {
@@ -161,17 +151,16 @@ def general_menu_section
       }
     end
 
-    def invite_members_menu_item(href:, partial:)
+    def invite_members_menu_item(partial:)
       ::Gitlab::Nav::TopNavMenuItem.build(
         id: 'invite',
         title: s_('InviteMember|Invite members'),
         icon: 'shaking_hands',
         partial: partial,
-        href: href,
+        component: 'invite_members',
         data: {
-          track_action: 'click_link_invite_members',
-          track_label: 'plus_menu_dropdown',
-          track_property: 'navigation_top'
+          trigger_source: 'top-nav',
+          trigger_element: 'text-emoji'
         }
       )
     end

app/models/issue.rb

@@ -108,6 +108,7 @@ def most_recent
   validates :issue_type, presence: true
   validates :namespace, presence: true
   validates :work_item_type, presence: true
+  validates :confidential, inclusion: { in: [true, false], message: 'must be a boolean' }
 
   validate :allowed_work_item_type_change, on: :update, if: :work_item_type_id_changed?
   validate :due_date_after_start_date

app/services/resource_access_tokens/create_service.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'securerandom'
+
 module ResourceAccessTokens
   class CreateService < BaseService
     def initialize(current_user, resource, params = {})
@@ -71,21 +73,15 @@ def default_user_params
     end
 
     def generate_username
-      base_username = "#{resource_type}_#{resource.id}_bot"
-
-      uniquify.string(base_username) { |s| User.find_by_username(s) }
+      username
     end
 
     def generate_email
-      email_pattern = "#{resource_type}#{resource.id}_bot%s@noreply.#{Gitlab.config.gitlab.host}"
-
-      uniquify.string(-> (n) { Kernel.sprintf(email_pattern, n) }) do |s|
-        User.find_by_email(s)
-      end
+      "#{username}@noreply.#{Gitlab.config.gitlab.host}"
     end
 
-    def uniquify
-      Gitlab::Utils::Uniquify.new
+    def username
+      @username ||= "#{resource_type}_#{resource.id}_bot_#{SecureRandom.hex(8)}"
     end
 
     def create_personal_access_token(user)

app/views/groups/_invite_members_top_nav_link.html.haml

@@ -1,6 +1,7 @@
-= link_to local_assigns.fetch(:href), class: local_assigns.fetch(:css_class), data: local_assigns.fetch(:data) do
-  = local_assigns.fetch(:display_text)
-  - if local_assigns.fetch(:icon)
-    = " #{emoji_icon(local_assigns.fetch(:icon), 'aria-hidden': true, class: 'gl-font-base gl-vertical-align-baseline')}".html_safe
+- data = local_assigns.fetch(:data)
+- data[:display_text] = local_assigns.fetch(:display_text)
+- data[:icon] = local_assigns.fetch(:icon)
+
+.js-invite-members-trigger{ data: data }
 
 = render 'groups/invite_members_modal', group: local_assigns.fetch(:context)

app/views/layouts/header/_new_dropdown.html.haml

@@ -31,8 +31,6 @@
                 locals: { context: view_model[:context],
                           display_text: menu_item.fetch(:title),
                           icon: menu_item.fetch(:icon),
-                          css_class: menu_item.fetch(:css_class),
-                          href: menu_item.fetch(:href),
                           data: menu_item.fetch(:data) }
             - else
               = link_to menu_item.fetch(:title),