Merge branch 'mattermost_update' into 'master'

Mattermost v2.1.0.

Fixes #1173

See merge request !686

config/software/mattermost.rb

@@ -17,10 +17,10 @@
 #
 
 name "mattermost"
-default_version "v2.0.0"
+default_version "v2.1.0"
 
 source url: "https://github.com/mattermost/platform/releases/download/#{version}/mattermost.tar.gz",
-       md5: '718ec216d0635a361b632699fc92a517'
+       md5: '751f237d227db6c8da73a79e41a545b2'
 
 build do
   move "bin/platform", "#{install_dir}/embedded/bin/mattermost"

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

@@ -600,6 +600,7 @@ external_url 'GENERATED_EXTERNAL_URL'
 # mattermost['service_enable_testing'] = false
 # mattermost['service_enable_security_fix_alert'] = true
 # mattermost['service_enable_insecure_outgoing_connections'] = false
+# mattermost['service_allow_cors_from'] = ""
 # mattermost['service_enable_outgoing_webhooks'] = true
 # mattermost['service_enable_commands'] = false
 # mattermost['service_enable_only_admin_integrations'] = true

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

@@ -651,6 +651,7 @@ default['gitlab']['mattermost']['service_enable_post_icon_override'] = false
 default['gitlab']['mattermost']['service_enable_testing'] = false
 default['gitlab']['mattermost']['service_enable_security_fix_alert'] = true
 default['gitlab']['mattermost']['service_enable_insecure_outgoing_connections'] = false
+default['gitlab']['mattermost']['service_allow_cors_from'] = nil
 default['gitlab']['mattermost']['service_enable_outgoing_webhooks'] = false
 default['gitlab']['mattermost']['service_enable_commands'] = false
 default['gitlab']['mattermost']['service_enable_only_admin_integrations'] = true

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

@@ -14,6 +14,7 @@
         "EnableTesting": <%= @service_enable_testing %>,
         "EnableSecurityFixAlert": <%= @service_enable_security_fix_alert %>,
         "EnableInsecureOutgoingConnections":  <%= @service_enable_insecure_outgoing_connections %>,
+        "AllowCorsFrom":  "<%= @service_allow_cors_from %>",
         "EnableDeveloper": <%= @service_enable_developer %>,
         "SessionLengthWebInDays" : <%= @service_session_length_web_in_days %>,
         "SessionLengthMobileInDays" : <%= @service_session_length_mobile_in_days %>,