diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-09-10 14:30:38 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-09-10 14:30:38 -0400 |
| commit | 1b52fe5092fdae3ca444c22155ceaeb44ecbcf24 (patch) | |
| tree | 73b880ee462b58233e61bf62ba51ba5d95d87b4a | |
| parent | 14b8e2a9bc33ec5f197d23361f64dd614b572f02 (diff) | |
| parent | 985426b9e73e43789d91d3f81465b681d30c9549 (diff) | |
| download | chat-1b52fe5092fdae3ca444c22155ceaeb44ecbcf24.tar.gz chat-1b52fe5092fdae3ca444c22155ceaeb44ecbcf24.tar.bz2 chat-1b52fe5092fdae3ca444c22155ceaeb44ecbcf24.zip | |
Merge release branch 'release-0.7.0'
| -rw-r--r-- | docker/0.7/Dockerfile | 2 | ||||
| -rw-r--r-- | web/web.go | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/docker/0.7/Dockerfile b/docker/0.7/Dockerfile index 4a8623d33..6e82fd809 100644 --- a/docker/0.7/Dockerfile +++ b/docker/0.7/Dockerfile @@ -34,7 +34,7 @@ VOLUME /var/lib/mysql WORKDIR /mattermost # Copy over files -ADD https://github.com/mattermost/platform/releases/download/v0.7.0/mattermost.tar.gz / +ADD https://github.com/mattermost/platform/releases/download/v0.7.1/mattermost.tar.gz / RUN tar -zxvf /mattermost.tar.gz --strip-components=1 && rm /mattermost.tar.gz ADD config_docker.json / ADD docker-entry.sh / diff --git a/web/web.go b/web/web.go index c79815a35..1709e1eec 100644 --- a/web/web.go +++ b/web/web.go @@ -561,6 +561,7 @@ func signupCompleteOAuth(c *api.Context, w http.ResponseWriter, r *http.Request) } user.TeamId = team.Id + user.EmailVerified = true ruser := api.CreateUser(c, team, user) if c.Err != nil { |