Automatic merge of gitlab-org/gitlab master

app/models/commit.rb

@@ -513,9 +513,7 @@ class Commit
     # We don't want to do anything for `Commit` model, so this is empty.
   end
 
-  # WIP is deprecated in favor of Draft. Currently both options are supported
-  # https://gitlab.com/gitlab-org/gitlab/-/issues/227426
-  DRAFT_REGEX = /\A\s*#{Regexp.union(Gitlab::Regex.merge_request_wip, Gitlab::Regex.merge_request_draft)}|(fixup!|squash!)\s/.freeze
+  DRAFT_REGEX = /\A\s*#{Gitlab::Regex.merge_request_draft}|(fixup!|squash!)\s/.freeze
 
   def work_in_progress?
     !!(title =~ DRAFT_REGEX)

app/views/layouts/nav/sidebar/_admin.html.haml

@@ -156,13 +156,13 @@
             = sprite_icon('slight-frown')
           %span.nav-item-name
             = _('Abuse Reports')
-          %span.badge.badge-pill.count= number_with_delimiter(AbuseReport.count(:all))
+          = gl_badge_tag number_with_delimiter(AbuseReport.count(:all)), variant: :info, size: :sm
         %ul.sidebar-sub-level-items.is-fly-out-only
           = nav_link(controller: :abuse_reports, html_options: { class: "fly-out-top-item" } ) do
             = link_to admin_abuse_reports_path do
               %strong.fly-out-top-item-name
                 = _('Abuse Reports')
-              %span.badge.badge-pill.count.merge_counter.js-merge-counter.fly-out-badge= number_with_delimiter(AbuseReport.count(:all))
+              = gl_badge_tag number_with_delimiter(AbuseReport.count(:all)), variant: :info, size: :sm
 
       = render_if_exists 'layouts/nav/sidebar/licenses_link'
 

package.json

@@ -62,36 +62,36 @@
     "@rails/ujs": "6.1.4-1",
     "@sentry/browser": "5.30.0",
     "@sourcegraph/code-host-integration": "0.0.60",
-    "@tiptap/core": "^2.0.0-beta.160",
+    "@tiptap/core": "^2.0.0-beta.171",
     "@tiptap/extension-blockquote": "^2.0.0-beta.26",
     "@tiptap/extension-bold": "^2.0.0-beta.25",
     "@tiptap/extension-bullet-list": "^2.0.0-beta.26",
     "@tiptap/extension-code": "^2.0.0-beta.26",
-    "@tiptap/extension-code-block-lowlight": "2.0.0-beta.63",
+    "@tiptap/extension-code-block-lowlight": "2.0.0-beta.68",
     "@tiptap/extension-document": "^2.0.0-beta.15",
     "@tiptap/extension-dropcursor": "^2.0.0-beta.25",
     "@tiptap/extension-gapcursor": "^2.0.0-beta.34",
     "@tiptap/extension-hard-break": "^2.0.0-beta.30",
-    "@tiptap/extension-heading": "^2.0.0-beta.24",
+    "@tiptap/extension-heading": "^2.0.0-beta.26",
     "@tiptap/extension-history": "^2.0.0-beta.21",
-    "@tiptap/extension-horizontal-rule": "^2.0.0-beta.30",
-    "@tiptap/extension-image": "^2.0.0-beta.24",
+    "@tiptap/extension-horizontal-rule": "^2.0.0-beta.31",
+    "@tiptap/extension-image": "^2.0.0-beta.25",
     "@tiptap/extension-italic": "^2.0.0-beta.25",
-    "@tiptap/extension-link": "^2.0.0-beta.34",
+    "@tiptap/extension-link": "^2.0.0-beta.36",
     "@tiptap/extension-list-item": "^2.0.0-beta.20",
     "@tiptap/extension-ordered-list": "^2.0.0-beta.27",
     "@tiptap/extension-paragraph": "^2.0.0-beta.23",
     "@tiptap/extension-strike": "^2.0.0-beta.27",
     "@tiptap/extension-subscript": "^2.0.0-beta.10",
     "@tiptap/extension-superscript": "^2.0.0-beta.10",
-    "@tiptap/extension-table": "^2.0.0-beta.46",
+    "@tiptap/extension-table": "^2.0.0-beta.48",
     "@tiptap/extension-table-cell": "^2.0.0-beta.20",
     "@tiptap/extension-table-header": "^2.0.0-beta.22",
     "@tiptap/extension-table-row": "^2.0.0-beta.19",
-    "@tiptap/extension-task-item": "^2.0.0-beta.30",
+    "@tiptap/extension-task-item": "^2.0.0-beta.31",
     "@tiptap/extension-task-list": "^2.0.0-beta.26",
     "@tiptap/extension-text": "^2.0.0-beta.15",
-    "@tiptap/vue-2": "^2.0.0-beta.74",
+    "@tiptap/vue-2": "^2.0.0-beta.77",
     "@toast-ui/editor": "^2.5.2",
     "@toast-ui/vue-editor": "^2.5.2",
     "apollo-cache-inmemory": "^1.6.6",
@@ -165,7 +165,7 @@
     "prosemirror-model": "^1.16.1",
     "prosemirror-state": "^1.3.4",
     "prosemirror-tables": "^1.1.1",
-    "prosemirror-view": "^1.23.5",
+    "prosemirror-view": "^1.23.6",
     "raphael": "^2.2.7",
     "raw-loader": "^4.0.2",
     "scrollparent": "^2.0.1",

spec/frontend/content_editor/test_utils.js

@@ -132,7 +132,7 @@ export const triggerNodeInputRule = ({ tiptapEditor, inputRuleText }) => {
 export const triggerMarkInputRule = ({ tiptapEditor, inputRuleText }) => {
   const { view } = tiptapEditor;
 
-  tiptapEditor.chain().setContent(inputRuleText).setTextSelection(0).run();
+  tiptapEditor.chain().setContent(inputRuleText).setTextSelection(1).run();
 
   const { state } = tiptapEditor;
   const { selection } = state;

spec/models/commit_spec.rb

@@ -748,29 +748,23 @@ eos
 
   describe '#work_in_progress?' do
     [
-      'squash! ', 'fixup! ', 'wip: ', 'WIP: ', '[WIP] ',
+      'squash! ', 'fixup! ',
       'draft: ', '[Draft] ', '(draft) ', 'Draft: '
-    ].each do |wip_prefix|
-      it "detects the '#{wip_prefix}' prefix" do
-        commit.message = "#{wip_prefix}#{commit.message}"
+    ].each do |draft_prefix|
+      it "detects the '#{draft_prefix}' prefix" do
+        commit.message = "#{draft_prefix}#{commit.message}"
 
         expect(commit).to be_work_in_progress
       end
     end
 
-    it "detects WIP for a commit just saying 'wip'" do
-      commit.message = "wip"
-
-      expect(commit).to be_work_in_progress
-    end
-
     it "does not detect WIP for a commit just saying 'draft'" do
       commit.message = "draft"
 
       expect(commit).not_to be_work_in_progress
     end
 
-    ["FIXUP!", "Draft - ", "Wipeout"].each do |draft_prefix|
+    ["FIXUP!", "Draft - ", "Wipeout", "WIP: ", "[WIP] ", "wip: "].each do |draft_prefix|
       it "doesn't detect '#{draft_prefix}' at the start of the title as a draft" do
         commit.message = "#{draft_prefix} #{commit.message}"