Merge branch 'add-bio-prefix' into 'master'

Drop Markdown support in bio field

See merge request gitlab-org/gitlab!68628

app/assets/javascripts/user_popovers.js

 import Vue from 'vue';
-
-import { sanitize } from '~/lib/dompurify';
-
 import UsersCache from './lib/utils/users_cache';
 import UserPopover from './vue_shared/components/user_popover/user_popover.vue';
 
@@ -41,7 +38,6 @@ const populateUserInfo = (user) => {
           name: userData.name,
           location: userData.location,
           bio: userData.bio,
-          bioHtml: sanitize(userData.bio_html),
           workInformation: userData.work_information,
           websiteUrl: userData.website_url,
           pronouns: userData.pronouns,

app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue

@@ -82,11 +82,7 @@ export default {
           <div class="gl-text-gray-500">
             <div v-if="user.bio" class="gl-display-flex gl-mb-2">
               <gl-icon name="profile" class="gl-text-gray-400 gl-flex-shrink-0" />
-              <span
-                ref="bio"
-                class="gl-ml-2 gl-overflow-hidden"
-                v-html="user.bioHtml /* eslint-disable-line vue/no-v-html */"
-              ></span>
+              <span ref="bio" class="gl-ml-2 gl-overflow-hidden">{{ user.bio }}</span>
             </div>
             <div v-if="user.workInformation" class="gl-display-flex gl-mb-2">
               <gl-icon name="work" class="gl-text-gray-400 gl-flex-shrink-0" />

app/models/user.rb

@@ -314,7 +314,7 @@ class User < ApplicationRecord
   delegate :path, to: :namespace, allow_nil: true, prefix: true
   delegate :job_title, :job_title=, to: :user_detail, allow_nil: true
   delegate :other_role, :other_role=, to: :user_detail, allow_nil: true
-  delegate :bio, :bio=, :bio_html, to: :user_detail, allow_nil: true
+  delegate :bio, :bio=, to: :user_detail, allow_nil: true
   delegate :webauthn_xid, :webauthn_xid=, to: :user_detail, allow_nil: true
   delegate :pronouns, :pronouns=, to: :user_detail, allow_nil: true
   delegate :pronunciation, :pronunciation=, to: :user_detail, allow_nil: true

app/models/user_detail.rb

@@ -2,7 +2,8 @@
 
 class UserDetail < ApplicationRecord
   extend ::Gitlab::Utils::Override
-  include CacheMarkdownField
+  include IgnorableColumns
+  ignore_columns %i[bio_html cached_markdown_version], remove_with: '13.6', remove_after: '2021-10-22'
 
   belongs_to :user
 
@@ -13,20 +14,6 @@ class UserDetail < ApplicationRecord
 
   before_save :prevent_nil_bio
 
-  cache_markdown_field :bio
-
-  def bio_html
-    read_attribute(:bio_html) || bio
-  end
-
-  # For backward compatibility.
-  # Older migrations (and their tests) reference the `User.migration_bot` where the `bio` attribute is set.
-  # Here we disable writing the markdown cache when the `bio_html` column does not exist.
-  override :invalidated_markdown_cache?
-  def invalidated_markdown_cache?
-    self.class.column_names.include?('bio_html') && super
-  end
-
   private
 
   def prevent_nil_bio

app/views/users/show.html.haml

@@ -2,7 +2,7 @@
 - @hide_breadcrumbs = true
 - @no_container = true
 - page_title       user_display_name(@user)
-- page_description @user.bio_html
+- page_description @user.bio
 - header_title     @user.name, user_path(@user)
 - page_itemtype    'http://schema.org/Person'
 - link_classes = "flex-grow-1 mx-1 "
@@ -127,7 +127,7 @@
         - if @user.bio.present?
           .gl-text-gray-900
             .profile-user-bio
-              = markdown(@user.bio_html)
+              = @user.bio
 
 
     - unless profile_tabs.empty?

doc/api/users.md

@@ -124,7 +124,6 @@ GET /users
     "created_at": "2012-05-23T08:00:58Z",
     "is_admin": false,
     "bio": "",
-    "bio_html": "",
     "location": null,
     "skype": "",
     "linkedin": "",
@@ -164,7 +163,6 @@ GET /users
     "created_at": "2012-05-23T08:01:01Z",
     "is_admin": false,
     "bio": "",
-    "bio_html": "",
     "location": null,
     "skype": "",
     "linkedin": "",
@@ -283,7 +281,6 @@ Parameters:
   "web_url": "http://localhost:3000/john_smith",
   "created_at": "2012-05-23T08:00:58Z",
   "bio": "",
-  "bio_html": "",
   "bot": false,
   "location": null,
   "public_email": "john@example.com",
@@ -322,7 +319,6 @@ Example Responses:
   "created_at": "2012-05-23T08:00:58Z",
   "is_admin": false,
   "bio": "",
-  "bio_html": "",
   "location": null,
   "public_email": "john@example.com",
   "skype": "",
@@ -551,7 +547,6 @@ GET /user
   "web_url": "http://localhost:3000/john_smith",
   "created_at": "2012-05-23T08:00:58Z",
   "bio": "",
-  "bio_html": "",
   "location": null,
   "public_email": "john@example.com",
   "skype": "",
@@ -601,7 +596,6 @@ GET /user
   "created_at": "2012-05-23T08:00:58Z",
   "is_admin": false,
   "bio": "",
-  "bio_html": "",
   "location": null,
   "public_email": "john@example.com",
   "skype": "",

lib/api/entities/user.rb

@@ -4,8 +4,10 @@ module API
   module Entities
     class User < UserBasic
       include UsersHelper
+      include ActionView::Helpers::SanitizeHelper
+
       expose :created_at, if: ->(user, opts) { Ability.allowed?(opts[:current_user], :read_user_profile, user) }
-      expose :bio, :bio_html, :location, :public_email, :skype, :linkedin, :twitter, :website_url, :organization, :job_title, :pronouns
+      expose :bio, :location, :public_email, :skype, :linkedin, :twitter, :website_url, :organization, :job_title, :pronouns
       expose :bot?, as: :bot
       expose :work_information do |user|
         work_information(user)
@@ -16,6 +18,12 @@ module API
       expose :following, if: ->(user, opts) { Ability.allowed?(opts[:current_user], :read_user_profile, user) } do |user|
         user.followees.size
       end
+
+      # This is only for multi version compatibility reasons, as we removed user.bio_html
+      # to be removed in 14.4
+      expose :bio_html do |user|
+        strip_tags(user.bio)
+      end
     end
   end
 end

spec/features/profiles/user_edit_profile_spec.rb

@@ -45,7 +45,6 @@ RSpec.describe 'User edit profile' do
       twitter: 'testtwitter',
       website_url: 'testurl',
       bio: 'I <3 GitLab :tada:',
-      bio_html: '<p data-sourcepos="1:1-1:18" dir="auto">I &lt;3 GitLab <gl-emoji title="party popper" data-name="tada" data-unicode-version="6.0">🎉</gl-emoji></p>',
       job_title: 'Frontend Engineer',
       organization: 'GitLab'
     )

spec/features/users/show_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 RSpec.describe 'User page' do
   include ExternalAuthorizationServiceHelpers
 
-  let_it_be(:user) { create(:user, bio: '**Lorem** _ipsum_ dolor sit [amet](https://example.com)') }
+  let_it_be(:user) { create(:user, bio: '<b>Lorem</b> <i>ipsum</i> dolor sit <a href="https://example.com">amet</a>') }
 
   subject(:visit_profile) { visit(user_path(user)) }
 

spec/frontend/vue_shared/components/user_popover/user_popover_spec.js

@@ -94,7 +94,7 @@ describe('User Popover Component', () => {
     const bio = 'My super interesting bio';
 
     it('should show only bio if work information is not available', () => {
-      const user = { ...DEFAULT_PROPS.user, bio, bioHtml: bio };
+      const user = { ...DEFAULT_PROPS.user, bio };
 
       createWrapper({ user });
 
@@ -117,7 +117,6 @@ describe('User Popover Component', () => {
       const user = {
         ...DEFAULT_PROPS.user,
         bio,
-        bioHtml: bio,
         workInformation: 'Frontend Engineer at GitLab',
       };
 
@@ -127,16 +126,15 @@ describe('User Popover Component', () => {
       expect(findWorkInformation().text()).toBe('Frontend Engineer at GitLab');
     });
 
-    it('should not encode special characters in bio', () => {
+    it('should encode special characters in bio', () => {
       const user = {
         ...DEFAULT_PROPS.user,
-        bio: 'I like CSS',
-        bioHtml: 'I like <b>CSS</b>',
+        bio: 'I like <b>CSS</b>',
       };
 
       createWrapper({ user });
 
-      expect(findBio().html()).toContain('I like <b>CSS</b>');
+      expect(findBio().html()).toContain('I like &lt;b&gt;CSS&lt;/b&gt;');
     });
 
     it('shows icon for bio', () => {

spec/models/user_detail_spec.rb

@@ -25,29 +25,4 @@ RSpec.describe UserDetail do
       it { is_expected.to validate_length_of(:bio).is_at_most(255) }
     end
   end
-
-  describe '#bio_html' do
-    let(:user) { create(:user, bio: 'some **bio**') }
-
-    subject { user.user_detail.bio_html }
-
-    it 'falls back to #bio when the html representation is missing' do
-      user.user_detail.update!(bio_html: nil)
-
-      expect(subject).to eq(user.user_detail.bio)
-    end
-
-    it 'stores rendered html' do
-      expect(subject).to include('some <strong>bio</strong>')
-    end
-
-    it 'does not try to set the value when the column is not there' do
-      without_bio_html_column = UserDetail.column_names - ['bio_html']
-
-      expect(described_class).to receive(:column_names).at_least(:once).and_return(without_bio_html_column)
-      expect(user.user_detail).not_to receive(:bio_html=)
-
-      subject
-    end
-  end
 end

spec/models/user_spec.rb

@@ -82,7 +82,6 @@ RSpec.describe User do
 
     it { is_expected.to delegate_method(:bio).to(:user_detail).allow_nil }
     it { is_expected.to delegate_method(:bio=).to(:user_detail).with_arguments(:args).allow_nil }
-    it { is_expected.to delegate_method(:bio_html).to(:user_detail).allow_nil }
   end
 
   describe 'associations' do