Merge branch 'mattermost_version' into 'master'

Mattermost v1.3.0.

Fixes #989 

See merge request !566

config/software/mattermost.rb

@@ -17,10 +17,10 @@
 #
 
 name "mattermost"
-default_version "v1.2.1"
+default_version "v1.3.0"
 
 source url: "https://github.com/mattermost/platform/releases/download/#{version}/mattermost.tar.gz",
-       md5: '0bce907ee9f454499ee501ac274a8508'
+       md5: 'a423e138520ddfcd6f563f8515c34761'
 
 build do
   move "bin/platform", "#{install_dir}/embedded/bin/mattermost"

files/gitlab-config-template/gitlab.rb.template

@@ -753,9 +753,8 @@ external_url 'GENERATED_EXTERNAL_URL'
 # mattermost['email_connection_security'] = nil
 # mattermost['email_feedback_name'] = nil
 # mattermost['email_feedback_email'] = nil
-# mattermost['email_apple_push_server'] = nil
-# mattermost['email_apple_push_cert_public'] = nil
-# mattermost['email_apple_push_cert_private'] = nil
+# mattermost['email_send_push_notifications'] = true
+# mattermost['email_push_notification_server'] = ""
 
 # mattermost['file_driver_name'] = "local"
 # mattermost['file_directory'] = "/var/opt/gitlab/mattermost/data"

files/gitlab-cookbooks/gitlab/attributes/default.rb

@@ -646,9 +646,8 @@ default['gitlab']['mattermost']['email_smtp_password'] = nil
 default['gitlab']['mattermost']['email_smtp_server'] = nil
 default['gitlab']['mattermost']['email_smtp_port'] = nil
 default['gitlab']['mattermost']['email_connection_security'] = nil
-default['gitlab']['mattermost']['email_apple_push_server'] = nil
-default['gitlab']['mattermost']['email_apple_push_cert_public'] = nil
-default['gitlab']['mattermost']['email_apple_push_cert_private'] = nil
+default['gitlab']['mattermost']['email_send_push_notifications'] = false
+default['gitlab']['mattermost']['email_push_notification_server'] = nil
 
 default['gitlab']['mattermost']['ratelimit_enable_rate_limiter'] = true
 default['gitlab']['mattermost']['ratelimit_per_sec'] = 10

files/gitlab-cookbooks/gitlab/templates/default/config.json.erb

@@ -67,9 +67,8 @@
         "PasswordResetSalt": "<%= @email_password_reset_salt %>",
         "FeedbackName": "<%= @email_feedback_name %>",
         "FeedbackEmail": "<%= @email_feedback_email %>",
-        "ApplePushServer": "<%= @email_apple_push_server %>",
-        "ApplePushCertPublic": "<%= @email_apple_push_cert_public %>",
-        "ApplePushCertPrivate": "<%= @email_apple_push_cert_private %>"
+        "SendPushNotifications": <%= @email_send_push_notifications %>,
+        "PushNotificationServer": "<%= @email_push_notification_server %>"
     },
     "RateLimitSettings": {
         "EnableRateLimiter": <%= @ratelimit_enable_rate_limiter %>,