IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge release branch 'release-0.7.0'

Browse Source
This commit is contained in:
Christopher Speller
2015-09-10 14:30:38 -04:00
parent 14b8e2a9bc 985426b9e7
commit 1b52fe5092
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/0.7/Dockerfile
View File

@@ -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 /

1
web/web.go
View File

@@ -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 {