Merge branch 'fix-services' into 'master'

Procfile

 web: bundle exec unicorn_rails -p ${PORT:="3000"} -E ${RAILS_ENV:="development"} -c ${UNICORN_CONFIG:="config/unicorn.rb"}
-worker: bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,common,default,gitlab_shell
+worker: bundle exec sidekiq -q post_receive -q mailer -q system_hook -q project_web_hook -q gitlab_shell -q common -q default

app/models/hooks/web_hook.rb

@@ -48,7 +48,7 @@ class WebHook < ActiveRecord::Base
                    verify: false,
                    basic_auth: auth)
     end
-  rescue SocketError, Errno::ECONNREFUSED => e
+  rescue SocketError, Errno::ECONNREFUSED, Net::OpenTimeout => e
     logger.error("WebHook Error => #{e}")
     false
   end

app/models/project_services/slack_message.rb

 require 'slack-notifier'
 
 class SlackMessage
+  attr_reader :after
+  attr_reader :before
+  attr_reader :commits
+  attr_reader :project_name
+  attr_reader :project_url
+  attr_reader :ref
+  attr_reader :username
+
   def initialize(params)
     @after = params.fetch(:after)
     @before = params.fetch(:before)
@@ -23,14 +31,6 @@ class SlackMessage
 
   private
 
-  attr_reader :after
-  attr_reader :before
-  attr_reader :commits
-  attr_reader :project_name
-  attr_reader :project_url
-  attr_reader :ref
-  attr_reader :username
-
   def message
     if new_branch?
       new_branch_message

app/workers/project_service_worker.rb

@@ -4,6 +4,7 @@ class ProjectServiceWorker
   sidekiq_options queue: :project_web_hook
 
   def perform(hook_id, data)
+    data = data.with_indifferent_access
     Service.find(hook_id).execute(data)
   end
 end

app/workers/project_web_hook_worker.rb

@@ -4,6 +4,7 @@ class ProjectWebHookWorker
   sidekiq_options queue: :project_web_hook
 
   def perform(hook_id, data)
-    WebHook.find(hook_id).execute data
+    data = data.with_indifferent_access
+    WebHook.find(hook_id).execute(data)
   end
 end