Merge branch 'develop' of github.com:martini/zammad into develop

Conflicts:
	test/unit/ticket_sla_test.rb

app/models/package.rb

@@ -207,11 +207,11 @@ class Package < ApplicationModel
       end
 
       # uninstall files of old package
-      self.uninstall({
+      self.uninstall(
         name: package_db.name,
         version: package_db.version,
         migration_not_down: true,
-      })
+      )
     end
 
     # store package

lib/sessions.rb

@@ -42,10 +42,13 @@ returns
 
     # send update to browser
     if session && session['id']
-      self.send( client_id, {
+      self.send(
+        client_id,
+        {
           event: 'ws:login',
           data: { success: true },
-      })
+        }
+      )
     end
   end
 

lib/sessions/backend/activity_stream.rb

@@ -54,11 +54,11 @@ class Sessions::Backend::ActivityStream
     end
 
     @client.log 'notify', "push activity_stream #{ data.first.class.to_s } for user #{ @user.id }"
-    @client.send({
+    @client.send(
       event: 'activity_stream_rebuild',
       collection: 'activity_stream',
       data: data,
-    })
+    )
   end
 
 end

lib/sessions/backend/collections/base.rb

@@ -74,18 +74,18 @@ class Sessions::Backend::Collections::Base
       }
     end
     @client.log 'notify', "push assets for push_collection #{ items.first.class.to_s } for user #{ @user.id }"
-    @client.send({
+    @client.send(
       data: assets,
       event: [ 'loadAssets' ],
-    })
+    )
 
     @client.log 'notify', "push push_collection #{ items.first.class.to_s } for user #{ @user.id }"
-    @client.send({
+    @client.send(
       event: 'resetCollection',
       data: {
         items.first.class.to_app_model => all,
       },
-    })
+    )
   end
 
   def self.model_set(model)

lib/sessions/backend/rss.rb

@@ -54,11 +54,11 @@ class Sessions::Backend::Rss
     end
 
     @client.log 'notify', "push rss for user #{@user.id}"
-    @client.send({
+    @client.send(
       event: 'rss_rebuild',
       collection: 'dashboard_rss',
       data: data,
-    })
+    )
   end
 
 end

lib/sessions/backend/ticket_create.rb

@@ -59,10 +59,10 @@ class Sessions::Backend::TicketCreate
     end
 
     @client.log 'notify', "push ticket_create for user #{ @user.id }"
-    @client.send({
+    @client.send(
       collection: 'ticket_create_attributes',
       data: data,
-    })
+    )
   end
 
 end

lib/sessions/backend/ticket_overview_index.rb

@@ -57,10 +57,10 @@ class Sessions::Backend::TicketOverviewIndex
     end
 
     @client.log 'notify', "push overview_index for user #{ @user.id }"
-    @client.send({
+    @client.send(
       event: ['ticket_overview_index'],
       data: data,
-    })
+    )
   end
 
 end

lib/sessions/backend/ticket_overview_list.rb

@@ -106,11 +106,11 @@ class Sessions::Backend::TicketOverviewList
         @client.log 'notify', "push overview_list for user #{ @user.id }"
 
         # send update to browser
-        @client.send({
+        @client.send(
           data: assets,
           event: [ 'loadAssets' ]
-        })
-        @client.send({
+        )
+        @client.send(
           data: {
             view: item[:index].link.to_s,
             overview: overview_data[:overview],
@@ -122,7 +122,7 @@ class Sessions::Backend::TicketOverviewList
             },
           },
           event: [ 'ticket_overview_rebuild' ],
-        })
+        )
       end
     }
     return results if !@client