Add latest changes from gitlab-org/gitlab@master

6 files changed, 18 insertions, 2 deletions

diff --git a/.rubocop_manual_todo.yml b/.rubocop_manual_todo.yml
index a9e01b4cfb3..b94dad0e3c7 100644
--- a/.rubocop_manual_todo.yml
+++ b/.rubocop_manual_todo.yml
@@ -2601,7 +2601,6 @@ Style/OpenStructUse:
     - 'spec/lib/gitlab/gitaly_client/blobs_stitcher_spec.rb'
     - 'spec/lib/gitlab/gitaly_client/diff_stitcher_spec.rb'
     - 'spec/lib/gitlab/grape_logging/loggers/exception_logger_spec.rb'
-    - 'spec/lib/gitlab/grape_logging/loggers/perf_logger_spec.rb'
     - 'spec/lib/gitlab/graphql/pagination/keyset/connection_generic_keyset_spec.rb'
     - 'spec/lib/gitlab/graphql/pagination/keyset/connection_spec.rb'
     - 'spec/lib/gitlab/legacy_github_import/project_creator_spec.rb'
diff --git a/app/assets/javascripts/lib/utils/constants.js b/app/assets/javascripts/lib/utils/constants.js
index 0e5a23a5cbb..36c6545164e 100644
--- a/app/assets/javascripts/lib/utils/constants.js
+++ b/app/assets/javascripts/lib/utils/constants.js
@@ -24,3 +24,5 @@ export const DEFAULT_TH_CLASSES =
 // We set the drawer's z-index to 252 to clear flash messages that might
 // be displayed in the page and that have a z-index of 251.
 export const DRAWER_Z_INDEX = 252;
+
+export const MIN_USERNAME_LENGTH = 2;
diff --git a/app/models/projects/topic.rb b/app/models/projects/topic.rb
index f3352ecc5ee..8d6f8c3a9ca 100644
--- a/app/models/projects/topic.rb
+++ b/app/models/projects/topic.rb
@@ -28,3 +28,5 @@ module Projects
     end
   end
 end
+
+::Projects::Topic.prepend_mod_with('Projects::Topic')
diff --git a/app/models/user_status.rb b/app/models/user_status.rb
index 5c446318dce..7a803e8f1f6 100644
--- a/app/models/user_status.rb
+++ b/app/models/user_status.rb
@@ -33,3 +33,5 @@ class UserStatus < ApplicationRecord
     self.clear_status_at = CLEAR_STATUS_QUICK_OPTIONS[value]&.from_now
   end
 end
+
+UserStatus.prepend_mod_with('UserStatus')
diff --git a/doc/administration/audit_events.md b/doc/administration/audit_events.md
index 03f0699f776..2062016ef03 100644
--- a/doc/administration/audit_events.md
+++ b/doc/administration/audit_events.md
@@ -73,6 +73,17 @@ From there, you can see the following actions:
 - Group changed visibility.
 - User was added to group and with which [permissions](../user/permissions.md).
 - User sign-in via [Group SAML](../user/group/saml_sso/index.md).
+- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/8071) in GitLab 14.5, changes to the following
+  [group SAML](../user/group/saml_sso/index.md) configuration:
+  - Enabled status.
+  - Enforcing SSO-only authentication for web activity.
+  - Enforcing SSO-only authentication for Git and Dependency Proxy activity.
+  - Enforcing users to have dedicated group-managed accounts.
+  - Prohibiting outer forks.
+  - Identity provider SSO URL.
+  - Certificate fingerprint.
+  - Default membership role.
+  - SSO-SAML group sync configuration.
 - Permissions changes of a user assigned to a group.
 - Removed user from group.
 - Project repository imported into group.
diff --git a/spec/lib/gitlab/grape_logging/loggers/perf_logger_spec.rb b/spec/lib/gitlab/grape_logging/loggers/perf_logger_spec.rb
index 641fb27a071..ef4bc0ca104 100644
--- a/spec/lib/gitlab/grape_logging/loggers/perf_logger_spec.rb
+++ b/spec/lib/gitlab/grape_logging/loggers/perf_logger_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::GrapeLogging::Loggers::PerfLogger do
-  let(:mock_request) { OpenStruct.new(env: {}) }
+  let(:mock_request) { double('env', env: {}) }
 
   describe ".parameters" do
     subject { described_class.new.parameters(mock_request, nil) }