Moved back to compact module/class declaration.

app/models/application_model/activity_stream_base.rb

@@ -1,7 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
-class ApplicationModel
-  module ActivityStreamBase
+# rubocop:disable ClassAndModuleChildren
+module ApplicationModel::ActivityStreamBase
 
 =begin
 
@@ -43,4 +42,3 @@ returns
     )
   end
 end
-end

app/models/application_model/assets.rb

@@ -1,7 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
-class ApplicationModel
-  module Assets
+# rubocop:disable ClassAndModuleChildren
+module ApplicationModel::Assets
 
 =begin
 
@@ -41,4 +40,3 @@ returns
     data
   end
 end
-end

app/models/application_model/background_job_search_index.rb

@@ -1,6 +1,6 @@
-# perform background job
-class ApplicationModel
-  class BackgroundJobSearchIndex
+# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
+# rubocop:disable ClassAndModuleChildren
+class ApplicationModel::BackgroundJobSearchIndex
   def initialize(object, o_id)
     @object = object
     @o_id   = o_id
@@ -10,4 +10,3 @@ class ApplicationModel
     Object.const_get(@object).find(@o_id).search_index_update_backend
   end
 end
-end

app/models/application_model/history_log_base.rb

@@ -1,7 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
-class ApplicationModel
-  module HistoryLogBase
+# rubocop:disable ClassAndModuleChildren
+module ApplicationModel::HistoryLogBase
 
 =begin
 
@@ -98,4 +97,3 @@ returns
     }
   end
 end
-end

app/models/application_model/search_index_base.rb

@@ -1,7 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
-class ApplicationModel
-  module SearchIndexBase
+# rubocop:disable ClassAndModuleChildren
+module ApplicationModel::SearchIndexBase
 
 =begin
 
@@ -143,4 +142,3 @@ returns
     attributes_new.merge(attributes)
   end
 end
-end