Add latest changes from gitlab-org/gitlab@master

2 files changed, 14 insertions, 2 deletions

diff --git a/lib/gitlab/ci/status/build/erased.rb b/lib/gitlab/ci/status/build/erased.rb
index d74cfc1ee77..c3430b8cc1c 100644
--- a/lib/gitlab/ci/status/build/erased.rb
+++ b/lib/gitlab/ci/status/build/erased.rb
@@ -7,8 +7,8 @@ module Gitlab
         class Erased < Status::Extended
           def illustration
             {
-              image: 'illustrations/erased-log_empty.svg',
-              size: 'svg-430',
+              image: 'illustrations/empty-state/empty-projects-deleted-md.svg',
+              size: 'svg-150',
               title: _('Job has been erased')
             }
           end
diff --git a/lib/gitlab/registration_features/password_complexity.rb b/lib/gitlab/registration_features/password_complexity.rb
new file mode 100644
index 00000000000..6d165a7a665
--- /dev/null
+++ b/lib/gitlab/registration_features/password_complexity.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module RegistrationFeatures
+    class PasswordComplexity
+      def self.feature_available?
+        ::License.feature_available?(:password_complexity) ||
+          ::GitlabSubscriptions::Features.usage_ping_feature?(:password_complexity)
+      end
+    end
+  end
+end