diff --git a/.rubocop.yml b/.rubocop.yml
index 66b17d28e..bc92e3f6d 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -173,11 +173,6 @@ Style/Documentation:
   Description: 'Document classes and non-namespace modules.'
   Enabled: false
 
-Style/EmptyLineBetweenDefs:
-  Description: 'Use empty lines between defs.'
-  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#empty-lines-between-methods'
-  Enabled: false
-
 Rails/ActionFilter:
   Description: 'Enforces consistent use of action filter methods.'
   Enabled: false
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d1476a309..1cd46423b 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -64,6 +64,7 @@ class ApplicationController < ActionController::Base
     return if !session[:user_id]
     @_current_user = User.find( session[:user_id] )
   end
+
   def current_user_set(user)
     session[:user_id] = user.id
     @_current_user = user
@@ -298,6 +299,7 @@ class ApplicationController < ActionController::Base
     logger.error e.backtrace.inspect
     render json: { error: e.message }, status: :unprocessable_entity
   end
+
   def model_create_render_item (generic_object)
     render json: generic_object.attributes_with_associations, status: :created
   end
@@ -319,6 +321,7 @@ class ApplicationController < ActionController::Base
     logger.error e.backtrace.inspect
     render json: { error: e.message }, status: :unprocessable_entity
   end
+
   def model_update_render_item (generic_object)
     render json: generic_object.attributes_with_associations, status: :ok
   end
@@ -332,6 +335,7 @@ class ApplicationController < ActionController::Base
     logger.error e.backtrace.inspect
     render json: { error: e.message }, status: :unprocessable_entity
   end
+
   def model_destory_render_item ()
     render json: {}, status: :ok
   end
@@ -351,6 +355,7 @@ class ApplicationController < ActionController::Base
     logger.error e.backtrace.inspect
     render json: { error: e.message }, status: :unprocessable_entity
   end
+
   def model_show_render_item (generic_object)
     render json: generic_object.attributes_with_associations, status: :ok
   end
@@ -363,6 +368,7 @@ class ApplicationController < ActionController::Base
     logger.error e.backtrace.inspect
     render json: { error: e.message }, status: :unprocessable_entity
   end
+
   def model_index_render_result (generic_objects)
     render json: generic_objects, status: :ok
   end
diff --git a/app/models/application_model.rb b/app/models/application_model.rb
index 2db5906d8..bd23ebfb0 100644
--- a/app/models/application_model.rb
+++ b/app/models/application_model.rb
@@ -459,6 +459,7 @@ end
   def latest_change_set_from_observer
     self.class.latest_change_set(self.updated_at)
   end
+
   def latest_change_set_from_observer_destroy
     self.class.latest_change_set(nil)
   end
@@ -1030,6 +1031,7 @@ get assets of object list
   def attachments_buffer
     @attachments_buffer_data
   end
+
   def attachments_buffer=(attachments)
     @attachments_buffer_data = attachments
   end
diff --git a/app/models/observer/organization/ref_object_touch.rb b/app/models/observer/organization/ref_object_touch.rb
index 5dc4b089b..84c617edf 100644
--- a/app/models/observer/organization/ref_object_touch.rb
+++ b/app/models/observer/organization/ref_object_touch.rb
@@ -6,9 +6,11 @@ class Observer::Organization::RefObjectTouch < ActiveRecord::Observer
   def after_create(record)
     ref_object_touch(record)
   end
+
   def after_update(record)
     ref_object_touch(record)
   end
+
   def after_destroy(record)
     ref_object_touch(record)
   end
diff --git a/app/models/observer/session.rb b/app/models/observer/session.rb
index 7bf93523e..cd051fb21 100644
--- a/app/models/observer/session.rb
+++ b/app/models/observer/session.rb
@@ -8,6 +8,7 @@ class Observer::Session < ActiveRecord::Observer
   def before_create(record)
     check(record)
   end
+
   def before_update(record)
     check(record)
   end
diff --git a/app/models/observer/tag/ticket_history.rb b/app/models/observer/tag/ticket_history.rb
index 9daeaf0f5..b9ba9470f 100644
--- a/app/models/observer/tag/ticket_history.rb
+++ b/app/models/observer/tag/ticket_history.rb
@@ -19,6 +19,7 @@ class Observer::Tag::TicketHistory < ActiveRecord::Observer
       value_to: record.tag_item.name,
     )
   end
+
   def after_destroy(record)
 
     # just process ticket object tags
diff --git a/app/models/observer/ticket/article/communicate_email/background_job.rb b/app/models/observer/ticket/article/communicate_email/background_job.rb
index 87ac54d1a..4d396fcc1 100644
--- a/app/models/observer/ticket/article/communicate_email/background_job.rb
+++ b/app/models/observer/ticket/article/communicate_email/background_job.rb
@@ -2,6 +2,7 @@ class Observer::Ticket::Article::CommunicateEmail::BackgroundJob
   def initialize(id)
     @article_id = id
   end
+
   def perform
     record = Ticket::Article.find( @article_id )
 
diff --git a/app/models/observer/ticket/notification/background_job.rb b/app/models/observer/ticket/notification/background_job.rb
index 77af28320..f92241ee5 100644
--- a/app/models/observer/ticket/notification/background_job.rb
+++ b/app/models/observer/ticket/notification/background_job.rb
@@ -4,6 +4,7 @@ class Observer::Ticket::Notification::BackgroundJob
   def initialize(params)
     @p = params
   end
+
   def perform
     ticket  = Ticket.find(@p[:ticket_id])
     if @p[:article_id]
diff --git a/app/models/observer/ticket/online_notification_seen/background_job.rb b/app/models/observer/ticket/online_notification_seen/background_job.rb
index 33bddaff0..6bf4c684b 100644
--- a/app/models/observer/ticket/online_notification_seen/background_job.rb
+++ b/app/models/observer/ticket/online_notification_seen/background_job.rb
@@ -2,6 +2,7 @@ class Observer::Ticket::OnlineNotificationSeen::BackgroundJob
   def initialize(id)
     @ticket_id = id
   end
+
   def perform
 
     # set all online notifications to seen
diff --git a/app/models/observer/ticket/ref_object_touch.rb b/app/models/observer/ticket/ref_object_touch.rb
index 60f19cae0..f41f3547d 100644
--- a/app/models/observer/ticket/ref_object_touch.rb
+++ b/app/models/observer/ticket/ref_object_touch.rb
@@ -6,9 +6,11 @@ class Observer::Ticket::RefObjectTouch < ActiveRecord::Observer
   def after_create(record)
     ref_object_touch(record)
   end
+
   def after_update(record)
     ref_object_touch(record)
   end
+
   def after_destroy(record)
     ref_object_touch(record)
   end
diff --git a/app/models/observer/ticket/user_ticket_counter.rb b/app/models/observer/ticket/user_ticket_counter.rb
index 7896d44ad..7f7cd8c7e 100644
--- a/app/models/observer/ticket/user_ticket_counter.rb
+++ b/app/models/observer/ticket/user_ticket_counter.rb
@@ -6,6 +6,7 @@ class Observer::Ticket::UserTicketCounter < ActiveRecord::Observer
   def after_create(record)
     user_ticket_counter_update(record)
   end
+
   def after_update(record)
     user_ticket_counter_update(record)
   end
diff --git a/app/models/observer/ticket/user_ticket_counter/background_job.rb b/app/models/observer/ticket/user_ticket_counter/background_job.rb
index 825f66751..6fc761bef 100644
--- a/app/models/observer/ticket/user_ticket_counter/background_job.rb
+++ b/app/models/observer/ticket/user_ticket_counter/background_job.rb
@@ -2,6 +2,7 @@ class Observer::Ticket::UserTicketCounter::BackgroundJob
   def initialize(id)
     @customer_id = id
   end
+
   def perform
 
     # open ticket count
diff --git a/app/models/observer/user/geo.rb b/app/models/observer/user/geo.rb
index d7d540473..40dbab212 100644
--- a/app/models/observer/user/geo.rb
+++ b/app/models/observer/user/geo.rb
@@ -6,6 +6,7 @@ class Observer::User::Geo < ActiveRecord::Observer
   def before_create(record)
     check_geo(record)
   end
+
   def before_update(record)
     check_geo(record)
   end
diff --git a/app/models/observer/user/ref_object_touch.rb b/app/models/observer/user/ref_object_touch.rb
index 7616f7cf2..bad925f7b 100644
--- a/app/models/observer/user/ref_object_touch.rb
+++ b/app/models/observer/user/ref_object_touch.rb
@@ -6,9 +6,11 @@ class Observer::User::RefObjectTouch < ActiveRecord::Observer
   def after_create(record)
     ref_object_touch(record)
   end
+
   def after_update(record)
     ref_object_touch(record)
   end
+
   def after_destroy(record)
     ref_object_touch(record)
   end
diff --git a/app/models/observer/user/ticket_organization.rb b/app/models/observer/user/ticket_organization.rb
index 2f0e8c289..bed6dcac0 100644
--- a/app/models/observer/user/ticket_organization.rb
+++ b/app/models/observer/user/ticket_organization.rb
@@ -6,6 +6,7 @@ class Observer::User::TicketOrganization < ActiveRecord::Observer
   def after_create(record)
     check_organization(record)
   end
+
   def after_update(record)
     check_organization(record)
   end
diff --git a/app/models/setting.rb b/app/models/setting.rb
index 110d9a582..d6132d9c9 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -56,9 +56,11 @@ class Setting < ApplicationModel
   def delete_cache
     @@current[:settings_config] = nil
   end
+
   def set_initial
     self.state_initial = self.state
   end
+
   def state_check
 
     return if !(self.state || self.state == false)
diff --git a/app/models/taskbar.rb b/app/models/taskbar.rb
index 1349fd074..da5fc811a 100644
--- a/app/models/taskbar.rb
+++ b/app/models/taskbar.rb
@@ -11,6 +11,7 @@ class Taskbar < ApplicationModel
   def update_last_contact
     self.last_contact = Time.now
   end
+
   def set_user
     self.user_id = UserInfo.current_user_id
   end
diff --git a/app/models/translation.rb b/app/models/translation.rb
index 20164444d..c809a6c42 100644
--- a/app/models/translation.rb
+++ b/app/models/translation.rb
@@ -172,6 +172,7 @@ translate strings in ruby context, e. g. for notifications
     return if target_initial
     self.target_initial = self.target
   end
+
   def cache_clear
     Cache.delete( 'Translation::' + self.locale.downcase )
   end
diff --git a/db/migrate/20130726000001_update_session.rb b/db/migrate/20130726000001_update_session.rb
index 3399b9197..79486193b 100644
--- a/db/migrate/20130726000001_update_session.rb
+++ b/db/migrate/20130726000001_update_session.rb
@@ -3,6 +3,7 @@ class UpdateSession < ActiveRecord::Migration
     add_column :sessions, :request_type,      :integer, null: true
     add_index :sessions, :request_type
   end
+
   def down
   end
 end
diff --git a/db/migrate/20130815000002_update_ticket_number.rb b/db/migrate/20130815000002_update_ticket_number.rb
index e2664adb8..11949d58b 100644
--- a/db/migrate/20130815000002_update_ticket_number.rb
+++ b/db/migrate/20130815000002_update_ticket_number.rb
@@ -28,6 +28,7 @@ class UpdateTicketNumber < ActiveRecord::Migration
       frontend: false
     )
   end
+
   def down
   end
 end
diff --git a/db/migrate/20130817000001_update_auth.rb b/db/migrate/20130817000001_update_auth.rb
index d7cdd5e0a..559c42456 100644
--- a/db/migrate/20130817000001_update_auth.rb
+++ b/db/migrate/20130817000001_update_auth.rb
@@ -47,6 +47,7 @@ class UpdateAuth < ActiveRecord::Migration
       frontend: false
     )
   end
+
   def down
   end
 end
diff --git a/db/migrate/20140128000001_add_search_index.rb b/db/migrate/20140128000001_add_search_index.rb
index e1d092e15..114d3dbaf 100644
--- a/db/migrate/20140128000001_add_search_index.rb
+++ b/db/migrate/20140128000001_add_search_index.rb
@@ -53,6 +53,7 @@ class AddSearchIndex < ActiveRecord::Migration
     User.search_index_reload
     Organization.search_index_reload
   end
+
   def down
   end
 end
diff --git a/db/migrate/20150215082745_rename_avatar_typo.rb b/db/migrate/20150215082745_rename_avatar_typo.rb
index f0649f4f6..d0f9abcc5 100644
--- a/db/migrate/20150215082745_rename_avatar_typo.rb
+++ b/db/migrate/20150215082745_rename_avatar_typo.rb
@@ -2,6 +2,7 @@ class RenameAvatarTypo < ActiveRecord::Migration
   def up
     rename_column :avatars, :inital, :initial
   end
+
   def down
     rename_column :avatars, :initial, :inital
   end
diff --git a/lib/core_ext/class.rb b/lib/core_ext/class.rb
index 5cefe4e10..60123dcc3 100644
--- a/lib/core_ext/class.rb
+++ b/lib/core_ext/class.rb
@@ -7,6 +7,7 @@ class Class
       .tr('-', '_')
       .downcase
   end
+
   def to_app_model
     camel_cased_word = self.to_s
     camel_cased_word.gsub(/::/, '').to_sym
diff --git a/lib/core_ext/string.rb b/lib/core_ext/string.rb
index d9a5a5b30..183fbaf03 100644
--- a/lib/core_ext/string.rb
+++ b/lib/core_ext/string.rb
@@ -7,6 +7,7 @@ class String
     end
     body_quote
   end
+
   def word_wrap(*args)
     options = args.extract_options!
     unless args.blank?
diff --git a/test/browser/aab_unit_test.rb b/test/browser/aab_unit_test.rb
index 0009f2dcf..866f4818c 100644
--- a/test/browser/aab_unit_test.rb
+++ b/test/browser/aab_unit_test.rb
@@ -11,6 +11,7 @@ class AAbUnitTest < TestCase
       value: '0',
     )
   end
+
   def test_ui
     @browser = browser_instance
     location( url: browser_url + '/tests-ui' )
@@ -34,6 +35,7 @@ class AAbUnitTest < TestCase
       value: '0',
     )
   end
+
   def test_form
     @browser = browser_instance
     location( url: browser_url + '/tests-form' )
@@ -57,6 +59,7 @@ class AAbUnitTest < TestCase
       value: '0',
     )
   end
+
   def test_table
     @browser = browser_instance
     location( url: browser_url + '/tests-table' )
diff --git a/test/browser/taskbar_task_test.rb b/test/browser/taskbar_task_test.rb
index 4ae0ed371..25e27d7c8 100644
--- a/test/browser/taskbar_task_test.rb
+++ b/test/browser/taskbar_task_test.rb
@@ -20,6 +20,7 @@ class TaskbarTaskTest < TestCase
     )
     sleep 10
   end
+
   def test_persistant_task_b
     @browser = browser_instance
     login(
@@ -41,6 +42,7 @@ class TaskbarTaskTest < TestCase
 
     exists_not( css: '.active .newTicket input[name="title"]' )
   end
+
   def test_persistant_task_with_relogin
     @browser = browser_instance
     login(