4 files changed, 26 insertions, 28 deletions

diff --git a/app/assets/javascripts/vue_shared/components/code_block_highlighted.vue b/app/assets/javascripts/vue_shared/components/code_block_highlighted.vue
index 352d03befc3..d98858da95f 100644
--- a/app/assets/javascripts/vue_shared/components/code_block_highlighted.vue
+++ b/app/assets/javascripts/vue_shared/components/code_block_highlighted.vue
@@ -1,6 +1,6 @@
 <script>
+import { escape } from 'lodash';
 import SafeHtml from '~/vue_shared/directives/safe_html';
-
 import languageLoader from '~/content_editor/services/highlight_js_language_loader';
 import CodeBlock from './code_block.vue';
 
@@ -39,7 +39,7 @@ export default {
         return this.hljs.highlight(this.code, { language: this.language }).value;
       }
 
-      return this.code;
+      return escape(this.code);
     },
   },
   async mounted() {
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 4db5745c005..88a8851607b 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -97,11 +97,11 @@ class UsersController < ApplicationController
   end
 
   def groups
-    load_groups
-
     respond_to do |format|
       format.html { render 'show' }
       format.json do
+        load_groups
+
         render json: {
           html: view_to_html_string("shared/groups/_list", groups: @groups)
         }
@@ -110,36 +110,36 @@ class UsersController < ApplicationController
   end
 
   def projects
-    load_projects
-
-    present_projects(@projects)
+    present_projects do
+      load_projects
+    end
   end
 
   def contributed
-    load_contributed_projects
-
-    present_projects(@contributed_projects)
+    present_projects do
+      load_contributed_projects
+    end
   end
 
   def starred
-    load_starred_projects
-
-    present_projects(@starred_projects)
+    present_projects do
+      load_starred_projects
+    end
   end
 
   def followers
-    @user_followers = user.followers.page(params[:page])
-
-    present_users(@user_followers)
+    present_users do
+      @user_followers = user.followers.page(params[:page])
+    end
   end
 
   def following
-    @user_following = user.followees.page(params[:page])
-
-    present_users(@user_following)
+    present_users do
+      @user_following = user.followees.page(params[:page])
+    end
   end
 
-  def present_projects(projects)
+  def present_projects
     skip_pagination = Gitlab::Utils.to_boolean(params[:skip_pagination])
     skip_namespace = Gitlab::Utils.to_boolean(params[:skip_namespace])
     compact_mode = Gitlab::Utils.to_boolean(params[:compact_mode])
@@ -147,17 +147,19 @@ class UsersController < ApplicationController
     respond_to do |format|
       format.html { render 'show' }
       format.json do
+        projects = yield
+
         pager_json("shared/projects/_list", projects.count, projects: projects, skip_pagination: skip_pagination, skip_namespace: skip_namespace, compact_mode: compact_mode)
       end
     end
   end
 
   def snippets
-    load_snippets
-
     respond_to do |format|
       format.html { render 'show' }
       format.json do
+        load_snippets
+
         render json: {
           html: view_to_html_string("snippets/_snippets", collection: @snippets)
         }
@@ -281,10 +283,11 @@ class UsersController < ApplicationController
     access_denied! unless can?(current_user, :read_user_profile, user)
   end
 
-  def present_users(users)
+  def present_users
     respond_to do |format|
       format.html { render 'show' }
       format.json do
+        users = yield
         render json: {
           html: view_to_html_string("shared/users/index", users: users)
         }
diff --git a/app/models/user.rb b/app/models/user.rb
index 93c15229e03..7fd5d25d7e0 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -317,9 +317,6 @@ class User < ApplicationRecord
 
   validates :color_scheme_id, allow_nil: true, inclusion: { in: Gitlab::ColorSchemes.valid_ids,
                                                             message: ->(*) { _("%{placeholder} is not a valid color scheme") % { placeholder: '%{value}' } } }
-  validates :hide_no_ssh_key, allow_nil: false, inclusion: { in: [true, false] }
-  validates :hide_no_password, allow_nil: false, inclusion: { in: [true, false] }
-  validates :notified_of_own_activity, allow_nil: false, inclusion: { in: [true, false] }
 
   after_initialize :set_projects_limit
   before_validation :sanitize_attrs
diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index 78ccce2aaae..e527542e357 100644
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -23,8 +23,6 @@ class UserPreference < ApplicationRecord
     format: { with: ColorsHelper::HEX_COLOR_PATTERN },
     allow_blank: true
 
-  validates :time_display_relative, allow_nil: false, inclusion: { in: [true, false] }
-  validates :render_whitespace_in_code, allow_nil: false, inclusion: { in: [true, false] }
   validates :pass_user_identities_to_ci_jwt, allow_nil: false, inclusion: { in: [true, false] }
 
   validates :pinned_nav_items, json_schema: { filename: 'pinned_nav_items' }