Merge branch 'fix-class-definitions' into 'master'

Fix incorrect class definitions

See merge request gitlab-org/gitlab!26218

app/controllers/concerns/invisible_captcha.rb → app/controllers/concerns/invisible_captcha_on_signup.rb

 # frozen_string_literal: true
 
-module InvisibleCaptcha
+module InvisibleCaptchaOnSignup
   extend ActiveSupport::Concern
 
   included do

app/controllers/registrations_controller.rb

@@ -4,7 +4,7 @@ class RegistrationsController < Devise::RegistrationsController
   include Recaptcha::Verify
   include AcceptsPendingInvitations
   include RecaptchaExperimentHelper
-  include InvisibleCaptcha
+  include InvisibleCaptchaOnSignup
 
   layout :choose_layout
 

ee/app/models/weight_note.rb

 # frozen_string_literal: true
 
-module EE
-  class WeightNote < ::Note
+class WeightNote < ::Note
   attr_accessor :resource_parent, :event
 
   def self.from_event(event, resource: nil, resource_parent: nil)
@@ -47,5 +46,4 @@ module EE
     weight_text = html ? "<strong>#{event.weight}</strong>" : event.weight
     event.weight ? "changed weight to #{weight_text}" : 'removed the weight'
   end
-  end
 end

lib/declarative_policy.rb

@@ -13,6 +13,8 @@ require_dependency 'declarative_policy/step'
 require_dependency 'declarative_policy/base'
 
 module DeclarativePolicy
+  extend PreferredScope
+
   CLASS_CACHE_MUTEX = Mutex.new
   CLASS_CACHE_IVAR = :@__DeclarativePolicy_CLASS_CACHE
 

lib/declarative_policy/preferred_scope.rb

 # frozen_string_literal: true
 
 module DeclarativePolicy
+  module PreferredScope
     PREFERRED_SCOPE_KEY = :"DeclarativePolicy.preferred_scope"
 
-  class << self
     def with_preferred_scope(scope)
       Thread.current[PREFERRED_SCOPE_KEY], old_scope = scope, Thread.current[PREFERRED_SCOPE_KEY]
       yield

lib/gitlab/email.rb

+# frozen_string_literal: true
+
+module Gitlab
+  module Email
+    ProcessingError = Class.new(StandardError)
+    EmailUnparsableError = Class.new(ProcessingError)
+    SentNotificationNotFoundError = Class.new(ProcessingError)
+    ProjectNotFound = Class.new(ProcessingError)
+    EmptyEmailError = Class.new(ProcessingError)
+    AutoGeneratedEmailError = Class.new(ProcessingError)
+    UserNotFoundError = Class.new(ProcessingError)
+    UserBlockedError = Class.new(ProcessingError)
+    UserNotAuthorizedError = Class.new(ProcessingError)
+    NoteableNotFoundError = Class.new(ProcessingError)
+    InvalidRecordError = Class.new(ProcessingError)
+    InvalidNoteError = Class.new(InvalidRecordError)
+    InvalidIssueError = Class.new(InvalidRecordError)
+    InvalidMergeRequestError = Class.new(InvalidRecordError)
+    UnknownIncomingEmail = Class.new(ProcessingError)
+    InvalidAttachment = Class.new(ProcessingError)
+  end
+end

lib/gitlab/email/receiver.rb

@@ -5,23 +5,6 @@ require_dependency 'gitlab/email/handler'
 # Inspired in great part by Discourse's Email::Receiver
 module Gitlab
   module Email
-    ProcessingError = Class.new(StandardError)
-    EmailUnparsableError = Class.new(ProcessingError)
-    SentNotificationNotFoundError = Class.new(ProcessingError)
-    ProjectNotFound = Class.new(ProcessingError)
-    EmptyEmailError = Class.new(ProcessingError)
-    AutoGeneratedEmailError = Class.new(ProcessingError)
-    UserNotFoundError = Class.new(ProcessingError)
-    UserBlockedError = Class.new(ProcessingError)
-    UserNotAuthorizedError = Class.new(ProcessingError)
-    NoteableNotFoundError = Class.new(ProcessingError)
-    InvalidRecordError = Class.new(ProcessingError)
-    InvalidNoteError = Class.new(InvalidRecordError)
-    InvalidIssueError = Class.new(InvalidRecordError)
-    InvalidMergeRequestError = Class.new(InvalidRecordError)
-    UnknownIncomingEmail = Class.new(ProcessingError)
-    InvalidAttachment = Class.new(ProcessingError)
-
     class Receiver
       def initialize(raw)
         @raw = raw