From f04097bbd77ec64d69a972f9bfae177ca994efd1 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Thu, 14 Jan 2016 13:25:26 -0500
Subject: [PATCH 1/2] Encode url query properly for SSO switching

---
 .../components/user_settings/user_settings_security.jsx     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/react/components/user_settings/user_settings_security.jsx b/web/react/components/user_settings/user_settings_security.jsx
index d9c5f58a92..d1266dd3f2 100644
--- a/web/react/components/user_settings/user_settings_security.jsx
+++ b/web/react/components/user_settings/user_settings_security.jsx
@@ -206,7 +206,7 @@ export default class SecurityTab extends React.Component {
                     <div>
                         <a
                             className='btn btn-primary'
-                            href={'/' + teamName + '/claim?email=' + user.email}
+                            href={'/' + teamName + '/claim?email=' + encodeURIComponent(user.email)}
                         >
                             {'Switch to using email and password'}
                         </a>
@@ -221,7 +221,7 @@ export default class SecurityTab extends React.Component {
                     <div>
                         <a
                             className='btn btn-primary'
-                            href={'/' + teamName + '/claim?email=' + user.email + '&new_type=' + Constants.GITLAB_SERVICE}
+                            href={'/' + teamName + '/claim?email=' + encodeURIComponent(user.email) + '&new_type=' + Constants.GITLAB_SERVICE}
                         >
                             {'Switch to using GitLab SSO'}
                         </a>
@@ -236,7 +236,7 @@ export default class SecurityTab extends React.Component {
                     <div>
                         <a
                             className='btn btn-primary'
-                            href={'/' + teamName + '/claim?email=' + user.email + '&new_type=' + Constants.GOOGLE_SERVICE}
+                            href={'/' + teamName + '/claim?email=' + encodeURIComponent(user.email) + '&new_type=' + Constants.GOOGLE_SERVICE}
                         >
                             {'Switch to using Google SSO'}
                         </a>

From 8089487d5caccbc642e9fef8ee0e5930ff1e639d Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Thu, 14 Jan 2016 16:19:13 -0600
Subject: [PATCH 2/2] Fixing dockerfile for release

---
 docker/1.4/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/1.4/Dockerfile b/docker/1.4/Dockerfile
index 1f0acdfc97..8dcea3927a 100644
--- a/docker/1.4/Dockerfile
+++ b/docker/1.4/Dockerfile
@@ -34,7 +34,7 @@ VOLUME /var/lib/mysql
 WORKDIR /mattermost
 
 # Copy over files
-ADD https://github.com/mattermost/platform/releases/download/v1.4.0-rc2/mattermost.tar.gz /
+ADD https://github.com/mattermost/platform/releases/download/v1.4.0/mattermost.tar.gz /
 RUN tar -zxvf /mattermost.tar.gz --strip-components=1 && rm /mattermost.tar.gz
 ADD config_docker.json /
 ADD docker-entry.sh /